87 files changed, 1542 insertions, 1542 deletions

diff --git a/src/modules/options/CMakeLists.txt b/src/modules/options/CMakeLists.txt
index eb96bbeaa..7973f9be0 100644
--- a/src/modules/options/CMakeLists.txt
+++ b/src/modules/options/CMakeLists.txt
@@ -1,94 +1,94 @@
 # CMakeLists for src/modules/options
 
 SET(kvioptions_MOC_HDRS
-	container.h
+	OptionsWidgetContainer.h
 	dialog.h
-	instances.h
-	optw_antispam.h
-	optw_avatar.h
-	optw_channel.h
-	optw_connection.h
-	optw_ctcp.h
-	optw_ctcpfloodprotection.h
-	optw_dcc.h
-	optw_generalopt.h
-	optw_highlighting.h
-	optw_identity.h
-	optw_ignore.h
-	optw_input.h
-	optw_interfacefeatures.h
-	optw_interfacelookglobal.h
-	optw_irc.h
-	optw_ircoutput.h
-	optw_ircview.h
-	optw_lag.h
-	optw_logging.h
-	optw_mediatypes.h
-	optw_messages.h
-	optw_nickserv.h
-	optw_notify.h
-	optw_notifier.h
-	optw_protection.h
-	optw_proxy.h
-	optw_query.h
-	optw_servers.h
-	optw_sound.h
-	optw_windowlist.h
-	optw_textencoding.h
-	optw_texticons.h
-	optw_tools.h
-	optw_topiclabel.h
-	optw_away.h
-	optw_uparser.h
-	optw_urlhandlers.h
-	optw_userlist.h
-	optw_tray.h
+	OptionsInstanceManager.h
+	OptionsWidget_antiSpam.h
+	OptionsWidget_avatar.h
+	OptionsWidget_channel.h
+	OptionsWidget_connection.h
+	OptionsWidget_ctcp.h
+	OptionsWidget_ctcpFloodProtection.h
+	OptionsWidget_dcc.h
+	OptionsWidget_general.h
+	OptionsWidget_alertsAndHighlighting.h
+	OptionsWidget_identity.h
+	OptionsWidget_ignore.h
+	OptionsWidget_input.h
+	OptionsWidget_interfaceFeatures.h
+	OptionsWidget_theme.h
+	OptionsWidget_irc.h
+	OptionsWidget_ircOutput.h
+	OptionsWidget_ircView.h
+	OptionsWidget_lag.h
+	OptionsWidget_logging.h
+	OptionsWidget_mediaTypes.h
+	OptionsWidget_message.h
+	OptionsWidget_nickserv.h
+	OptionsWidget_notify.h
+	OptionsWidget_notifier.h
+	OptionsWidget_protection.h
+	OptionsWidget_proxy.h
+	OptionsWidget_query.h
+	OptionsWidget_servers.h
+	OptionsWidget_sound.h
+	OptionsWidget_windowList.h
+	OptionsWidget_textEncoding.h
+	OptionsWidget_textIcons.h
+	OptionsWidget_tools.h
+	OptionsWidget_topicLabel.h
+	OptionsWidget_away.h
+	OptionsWidget_uparser.h
+	OptionsWidget_urlHandlers.h
+	OptionsWidget_userList.h
+	OptionsWidget_tray.h
 )
 
 SET(kvioptions_SRCS
 	libkvioptions.cpp
-	container.cpp
+	OptionsWidgetContainer.cpp
 	dialog.cpp
-	instances.cpp
-	optw_antispam.cpp
-	optw_avatar.cpp
-	optw_channel.cpp
-	optw_connection.cpp
-	optw_ctcp.cpp
-	optw_ctcpfloodprotection.cpp
-	optw_dcc.cpp
-	optw_generalopt.cpp
-	optw_highlighting.cpp
-	optw_identity.cpp
-	optw_ignore.cpp
-	optw_input.cpp
-	optw_interfacefeatures.cpp
-	optw_interfacelookglobal.cpp
-	optw_irc.cpp
-	optw_ircoutput.cpp
-	optw_ircview.cpp
-	optw_lag.cpp
-	optw_logging.cpp
-	optw_mediatypes.cpp
-	optw_messages.cpp
-	optw_nickserv.cpp
-	optw_notify.cpp
-	optw_notifier.cpp
-	optw_protection.cpp
-	optw_proxy.cpp
-	optw_query.cpp
-	optw_servers.cpp
-	optw_sound.cpp
-	optw_windowlist.cpp
-	optw_textencoding.cpp
-	optw_texticons.cpp
-	optw_tools.cpp
-	optw_topiclabel.cpp
-	optw_away.cpp
-	optw_uparser.cpp
-	optw_urlhandlers.cpp
-	optw_userlist.cpp
-	optw_tray.cpp
+	OptionsInstanceManager.cpp
+	OptionsWidget_antiSpam.cpp
+	OptionsWidget_avatar.cpp
+	OptionsWidget_channel.cpp
+	OptionsWidget_connection.cpp
+	OptionsWidget_ctcp.cpp
+	OptionsWidget_ctcpFloodProtection.cpp
+	OptionsWidget_dcc.cpp
+	OptionsWidget_general.cpp
+	OptionsWidget_alertsAndHighlighting.cpp
+	OptionsWidget_identity.cpp
+	OptionsWidget_ignore.cpp
+	OptionsWidget_input.cpp
+	OptionsWidget_interfaceFeatures.cpp
+	OptionsWidget_theme.cpp
+	OptionsWidget_irc.cpp
+	OptionsWidget_ircOutput.cpp
+	OptionsWidget_ircView.cpp
+	OptionsWidget_lag.cpp
+	OptionsWidget_logging.cpp
+	OptionsWidget_mediaTypes.cpp
+	OptionsWidget_message.cpp
+	OptionsWidget_nickserv.cpp
+	OptionsWidget_notify.cpp
+	OptionsWidget_notifier.cpp
+	OptionsWidget_protection.cpp
+	OptionsWidget_proxy.cpp
+	OptionsWidget_query.cpp
+	OptionsWidget_servers.cpp
+	OptionsWidget_sound.cpp
+	OptionsWidget_windowList.cpp
+	OptionsWidget_textEncoding.cpp
+	OptionsWidget_textIcons.cpp
+	OptionsWidget_tools.cpp
+	OptionsWidget_topicLabel.cpp
+	OptionsWidget_away.cpp
+	OptionsWidget_uparser.cpp
+	OptionsWidget_urlHandlers.cpp
+	OptionsWidget_userList.cpp
+	OptionsWidget_tray.cpp
 )
 
 # After this call, files will be moc'ed to moc_kvi_*.cpp
diff --git a/src/modules/options/instances.cpp b/src/modules/options/OptionsInstanceManager.cpp
index b45fb4c9a..9e767f36e 100644
--- a/src/modules/options/instances.cpp
+++ b/src/modules/options/OptionsInstanceManager.cpp
@@ -2,7 +2,7 @@
 
 //=============================================================================
 //
-//   File : instances.cpp
+//   File : OptionsInstanceManager.cpp
 //
 //   This file is part of the KVIrc irc client distribution
 //   Copyright (C) 2001-2008 Szymon Stefanek (stefanek@tin.it)
@@ -30,180 +30,180 @@
 // so any change should go in that script
 //
 
-#include "optw_antispam.h"
-#include "optw_avatar.h"
-#include "optw_away.h"
-#include "optw_channel.h"
-#include "optw_connection.h"
-#include "optw_ctcp.h"
-#include "optw_ctcpfloodprotection.h"
-#include "optw_dcc.h"
-#include "optw_generalopt.h"
-#include "optw_highlighting.h"
-#include "optw_identity.h"
-#include "optw_ignore.h"
-#include "optw_input.h"
-#include "optw_interfacefeatures.h"
-#include "optw_interfacelookglobal.h"
-#include "optw_irc.h"
-#include "optw_ircoutput.h"
-#include "optw_ircview.h"
-#include "optw_lag.h"
-#include "optw_logging.h"
-#include "optw_mediatypes.h"
-#include "optw_messages.h"
-#include "optw_nickserv.h"
-#include "optw_notifier.h"
-#include "optw_notify.h"
-#include "optw_protection.h"
-#include "optw_proxy.h"
-#include "optw_query.h"
-#include "optw_servers.h"
-#include "optw_sound.h"
-#include "optw_textencoding.h"
-#include "optw_texticons.h"
-#include "optw_tools.h"
-#include "optw_topiclabel.h"
-#include "optw_tray.h"
-#include "optw_uparser.h"
-#include "optw_urlhandlers.h"
-#include "optw_userlist.h"
-#include "optw_windowlist.h"
+#include "OptionsWidget_antiSpam.h"
+#include "OptionsWidget_avatar.h"
+#include "OptionsWidget_away.h"
+#include "OptionsWidget_channel.h"
+#include "OptionsWidget_connection.h"
+#include "OptionsWidget_ctcp.h"
+#include "OptionsWidget_ctcpFloodProtection.h"
+#include "OptionsWidget_dcc.h"
+#include "OptionsWidget_general.h"
+#include "OptionsWidget_alertsAndHighlighting.h"
+#include "OptionsWidget_identity.h"
+#include "OptionsWidget_ignore.h"
+#include "OptionsWidget_input.h"
+#include "OptionsWidget_interfaceFeatures.h"
+#include "OptionsWidget_theme.h"
+#include "OptionsWidget_irc.h"
+#include "OptionsWidget_ircOutput.h"
+#include "OptionsWidget_ircView.h"
+#include "OptionsWidget_lag.h"
+#include "OptionsWidget_logging.h"
+#include "OptionsWidget_mediaTypes.h"
+#include "OptionsWidget_message.h"
+#include "OptionsWidget_nickserv.h"
+#include "OptionsWidget_notifier.h"
+#include "OptionsWidget_notify.h"
+#include "OptionsWidget_protection.h"
+#include "OptionsWidget_proxy.h"
+#include "OptionsWidget_query.h"
+#include "OptionsWidget_servers.h"
+#include "OptionsWidget_sound.h"
+#include "OptionsWidget_textEncoding.h"
+#include "OptionsWidget_textIcons.h"
+#include "OptionsWidget_tools.h"
+#include "OptionsWidget_topicLabel.h"
+#include "OptionsWidget_tray.h"
+#include "OptionsWidget_uparser.h"
+#include "OptionsWidget_urlHandlers.h"
+#include "OptionsWidget_userList.h"
+#include "OptionsWidget_windowList.h"
 
 #include "KviLocale.h"
 #include "KviIconManager.h"
-#include "instances.h"
+#include "OptionsInstanceManager.h"
 
 int g_iOptionWidgetInstances = 0;
 
 KviOptionsWidget * classKviAntispamOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviAntispamOptionsWidget(parent);
+	return new OptionsWidget_antispam(parent);
 }
 
 KviOptionsWidget * classKviAvatarAdvancedOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviAvatarAdvancedOptionsWidget(parent);
+	return new OptionsWidget_avatar(parent);
 }
 
 KviOptionsWidget * classKviAwayOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviAwayOptionsWidget(parent);
+	return new OptionsWidget_away(parent);
 }
 
 KviOptionsWidget * classKviChannelOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviChannelOptionsWidget(parent);
+	return new OptionsWidget_channel(parent);
 }
 
 KviOptionsWidget * classKviChannelGeneralOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviChannelGeneralOptionsWidget(parent);
+	return new OptionsWidget_channelGeneral(parent);
 }
 
 KviOptionsWidget * classKviChannelAdvancedOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviChannelAdvancedOptionsWidget(parent);
+	return new OptionsWidget_channelAdvanced(parent);
 }
 
 KviOptionsWidget * classKviConnectionOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviConnectionOptionsWidget(parent);
+	return new OptionsWidget_connection(parent);
 }
 
 KviOptionsWidget * classKviConnectionAdvancedOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviConnectionAdvancedOptionsWidget(parent);
+	return new OptionsWidget_connectionAdvanced(parent);
 }
 
 KviOptionsWidget * classKviSSLOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviSSLOptionsWidget(parent);
+	return new OptionsWidget_connectionSsl(parent);
 }
 
 KviOptionsWidget * classKviTransportOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviTransportOptionsWidget(parent);
+	return new OptionsWidget_connectionSocket(parent);
 }
 
 KviOptionsWidget * classKviIdentOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviIdentOptionsWidget(parent);
+	return new OptionsWidget_identService(parent);
 }
 
 KviOptionsWidget * classKviCtcpOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviCtcpOptionsWidget(parent);
+	return new OptionsWidget_ctcp(parent);
 }
 
 KviOptionsWidget * classKviCtcpFloodProtectionOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviCtcpFloodProtectionOptionsWidget(parent);
+	return new OptionsWidget_ctcpFloodProtection(parent);
 }
 
 KviOptionsWidget * classKviDccOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviDccOptionsWidget(parent);
+	return new OptionsWidget_dcc(parent);
 }
 
 KviOptionsWidget * classKviDccGeneralOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviDccGeneralOptionsWidget(parent);
+	return new OptionsWidget_dccGeneral(parent);
 }
 
 KviOptionsWidget * classKviDccAdvancedOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviDccAdvancedOptionsWidget(parent);
+	return new OptionsWidget_dccAdvanced(parent);
 }
 
 KviOptionsWidget * classKviDccSendOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviDccSendOptionsWidget(parent);
+	return new OptionsWidget_dccSend(parent);
 }
 
 KviOptionsWidget * classKviDccSendGeneralOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviDccSendGeneralOptionsWidget(parent);
+	return new OptionsWidget_dccSendGeneral(parent);
 }
 
 KviOptionsWidget * classKviDccSendAdvancedOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviDccSendAdvancedOptionsWidget(parent);
+	return new OptionsWidget_dccSendAdvanced(parent);
 }
 
 KviOptionsWidget * classKviDccChatOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviDccChatOptionsWidget(parent);
+	return new OptionsWidget_dccChat(parent);
 }
 
 KviOptionsWidget * classKviDccVoiceOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviDccVoiceOptionsWidget(parent);
+	return new OptionsWidget_dccVoice(parent);
 }
 
 KviOptionsWidget * classKviGeneralOptOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviGeneralOptOptionsWidget(parent);
+	return new OptionsWidget_general(parent);
 }
 
 KviOptionsWidget * classKviAlertHighlightingOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviAlertHighlightingOptionsWidget(parent);
+	return new OptionsWidget_alertsAndHighlighting(parent);
 }
 
 KviOptionsWidget * classKviHighlightingOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviHighlightingOptionsWidget(parent);
+	return new OptionsWidget_highlighting(parent);
 }
 
 KviOptionsWidget * classKviAlertOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviAlertOptionsWidget(parent);
+	return new OptionsWidget_alerts(parent);
 }
 
 KviOptionsWidget * classKviIdentityOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviIdentityOptionsWidget(parent);
+	return new OptionsWidget_identity(parent);
 }
 
 KviOptionsWidget * classKviIdentityGeneralOptionsWidget_createInstanceProc(QWidget * parent)
@@ -213,465 +213,465 @@ KviOptionsWidget * classKviIdentityGeneralOptionsWidget_createInstanceProc(QWidg
 
 KviOptionsWidget * classKviIdentityAvatarOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviIdentityAvatarOptionsWidget(parent);
+	return new OptionsWidget_identityAvatar(parent);
 }
 
 KviOptionsWidget * classKviIdentityAdvancedOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviIdentityAdvancedOptionsWidget(parent);
+	return new OptionsWidget_identityAdvanced(parent);
 }
 
 KviOptionsWidget * classKviIdentityProfileOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviIdentityProfileOptionsWidget(parent);
+	return new OptionsWidget_identityProfile(parent);
 }
 
 KviOptionsWidget * classKviIgnoreOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviIgnoreOptionsWidget(parent);
+	return new OptionsWidget_ignore(parent);
 }
 
 KviOptionsWidget * classKviInputLookOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviInputLookOptionsWidget(parent);
+	return new OptionsWidget_inputLook(parent);
 }
 
 KviOptionsWidget * classKviInputFeaturesOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviInputFeaturesOptionsWidget(parent);
+	return new OptionsWidget_inputFeatures(parent);
 }
 
 KviOptionsWidget * classKviInterfaceFeaturesOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviInterfaceFeaturesOptionsWidget(parent);
+	return new OptionsWidget_interfaceFeatures(parent);
 }
 
 KviOptionsWidget * classKviThemeGeneralOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviThemeGeneralOptionsWidget(parent);
+	return new OptionsWidget_theme(parent);
 }
 
 KviOptionsWidget * classKviThemeTransparencyOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviThemeTransparencyOptionsWidget(parent);
+	return new OptionsWidget_themeTransparency(parent);
 }
 
 KviOptionsWidget * classKviThemeMdiAreaOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviThemeMdiAreaOptionsWidget(parent);
+	return new OptionsWidget_themeMdiArea(parent);
 }
 
 KviOptionsWidget * classKviThemeToolBarAppletsOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviThemeToolBarAppletsOptionsWidget(parent);
+	return new OptionsWidget_themeToolBarApplets(parent);
 }
 
 KviOptionsWidget * classKviIrcOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviIrcOptionsWidget(parent);
+	return new OptionsWidget_irc(parent);
 }
 
 KviOptionsWidget * classKviIrcGeneralOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviIrcGeneralOptionsWidget(parent);
+	return new OptionsWidget_ircGeneral(parent);
 }
 
 KviOptionsWidget * classKviIrcAdvancedOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviIrcAdvancedOptionsWidget(parent);
+	return new OptionsWidget_ircAdvanced(parent);
 }
 
 KviOptionsWidget * classKviIrcOutputOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviIrcOutputOptionsWidget(parent);
+	return new OptionsWidget_ircOutput(parent);
 }
 
 KviOptionsWidget * classKviIrcViewThemeOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviIrcViewThemeOptionsWidget(parent);
+	return new OptionsWidget_ircViewTheme(parent);
 }
 
 KviOptionsWidget * classKviIrcViewLookOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviIrcViewLookOptionsWidget(parent);
+	return new OptionsWidget_ircViewLook(parent);
 }
 
 KviOptionsWidget * classKviIrcViewFeaturesOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviIrcViewFeaturesOptionsWidget(parent);
+	return new OptionsWidget_ircViewFeatures(parent);
 }
 
 KviOptionsWidget * classKviIrcViewMarkerOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviIrcViewMarkerOptionsWidget(parent);
+	return new OptionsWidget_ircViewMarker(parent);
 }
 
 KviOptionsWidget * classKviLagOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviLagOptionsWidget(parent);
+	return new OptionsWidget_lag(parent);
 }
 
 KviOptionsWidget * classKviLoggingOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviLoggingOptionsWidget(parent);
+	return new OptionsWidget_logging(parent);
 }
 
 KviOptionsWidget * classKviMediaTypesOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviMediaTypesOptionsWidget(parent);
+	return new OptionsWidget_mediaTypes(parent);
 }
 
 KviOptionsWidget * classKviMessageOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviMessageOptionsWidget(parent);
+	return new OptionsWidget_message(parent);
 }
 
 KviOptionsWidget * classKviPrivmsgOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviPrivmsgOptionsWidget(parent);
+	return new OptionsWidget_privmsg(parent);
 }
 
 KviOptionsWidget * classKviTimestampOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviTimestampOptionsWidget(parent);
+	return new OptionsWidget_timestamp(parent);
 }
 
 KviOptionsWidget * classKviMessageColorsOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviMessageColorsOptionsWidget(parent);
+	return new OptionsWidget_messageColors(parent);
 }
 
 KviOptionsWidget * classKviStandardColorsOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviStandardColorsOptionsWidget(parent);
+	return new OptionsWidget_standardColors(parent);
 }
 
 KviOptionsWidget * classKviNickServOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviNickServOptionsWidget(parent);
+	return new OptionsWidget_nickServ(parent);
 }
 
 KviOptionsWidget * classKviNotifierLookOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviNotifierLookOptionsWidget(parent);
+	return new OptionsWidget_notifierLook(parent);
 }
 
 KviOptionsWidget * classKviNotifierOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviNotifierOptionsWidget(parent);
+	return new OptionsWidget_notifier(parent);
 }
 
 KviOptionsWidget * classKviNotifyOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviNotifyOptionsWidget(parent);
+	return new OptionsWidget_notify(parent);
 }
 
 KviOptionsWidget * classKviProtectionOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviProtectionOptionsWidget(parent);
+	return new OptionsWidget_protection(parent);
 }
 
 KviOptionsWidget * classKviProxyOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviProxyOptionsWidget(parent);
+	return new OptionsWidget_proxy(parent);
 }
 
 KviOptionsWidget * classKviQueryOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviQueryOptionsWidget(parent);
+	return new OptionsWidget_query(parent);
 }
 
 KviOptionsWidget * classKviIrcServerOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviIrcServerOptionsWidget(parent);
+	return new OptionsWidget_servers(parent);
 }
 
 KviOptionsWidget * classKviSoundOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviSoundOptionsWidget(parent);
+	return new OptionsWidget_sound(parent);
 }
 
 KviOptionsWidget * classKviSoundGeneralOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviSoundGeneralOptionsWidget(parent);
+	return new OptionsWidget_soundGeneral(parent);
 }
 
 KviOptionsWidget * classKviSoundsOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviSoundsOptionsWidget(parent);
+	return new OptionsWidget_sounds(parent);
 }
 
 KviOptionsWidget * classKviTextEncodingOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviTextEncodingOptionsWidget(parent);
+	return new OptionsWidget_textEncoding(parent);
 }
 
 KviOptionsWidget * classKviTextIconsOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviTextIconsOptionsWidget(parent);
+	return new OptionsWidget_textIcons(parent);
 }
 
 KviOptionsWidget * classKviToolsOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviToolsOptionsWidget(parent);
+	return new OptionsWidget_tools(parent);
 }
 
 KviOptionsWidget * classKviTopicLabelLookOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviTopicLabelLookOptionsWidget(parent);
+	return new OptionsWidget_topicLabel(parent);
 }
 
 KviOptionsWidget * classKviTrayOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviTrayOptionsWidget(parent);
+	return new OptionsWidget_tray(parent);
 }
 
 KviOptionsWidget * classKviUParserOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviUParserOptionsWidget(parent);
+	return new OptionsWidget_uparser(parent);
 }
 
 KviOptionsWidget * classKviUrlHandlersOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviUrlHandlersOptionsWidget(parent);
+	return new OptionsWidget_urlHandlers(parent);
 }
 
 KviOptionsWidget * classKviUserListLookOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviUserListLookOptionsWidget(parent);
+	return new OptionsWidget_userList(parent);
 }
 
 KviOptionsWidget * classKviUserListLookBackgroundOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviUserListLookBackgroundOptionsWidget(parent);
+	return new OptionsWidget_userListBackground(parent);
 }
 
 KviOptionsWidget * classKviUserListLookForegroundOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviUserListLookForegroundOptionsWidget(parent);
+	return new OptionsWidget_userListForeground(parent);
 }
 
 KviOptionsWidget * classKviUserListGridOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviUserListGridOptionsWidget(parent);
+	return new OptionsWidget_userListGrid(parent);
 }
 
 KviOptionsWidget * classKviUserListFeaturesOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviUserListFeaturesOptionsWidget(parent);
+	return new OptionsWidget_userListFeatures(parent);
 }
 
 KviOptionsWidget * classKviWindowListOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviWindowListOptionsWidget(parent);
+	return new OptionsWidget_windowList(parent);
 }
 
 KviOptionsWidget * classKviTreeWindowListOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviTreeWindowListOptionsWidget(parent);
+	return new OptionsWidget_windowListTree(parent);
 }
 
 KviOptionsWidget * classKviTreeWindowListForegroundOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviTreeWindowListForegroundOptionsWidget(parent);
+	return new OptionsWidget_windowListTreeForeground(parent);
 }
 
 KviOptionsWidget * classKviTreeWindowListBackgroundOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviTreeWindowListBackgroundOptionsWidget(parent);
+	return new OptionsWidget_windowListTreeBackground(parent);
 }
 
 KviOptionsWidget * classKviTreeWindowListFeaturesOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviTreeWindowListFeaturesOptionsWidget(parent);
+	return new OptionsWidget_windowListTreeFeatures(parent);
 }
 
 KviOptionsWidget * classKviClassicWindowListOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviClassicWindowListOptionsWidget(parent);
+	return new OptionsWidget_windowListClassic(parent);
 }
 
 
 
 static const char * g_szName_KviAntispamOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviAntispamOptionsWidget;
-static const char * g_szClassName_KviAntispamOptionsWidget = "KviAntispamOptionsWidget";
+static const char * g_szClassName_KviAntispamOptionsWidget = "OptionsWidget_antispam";
 static const char * g_szName_KviAvatarAdvancedOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviAvatarAdvancedOptionsWidget;
-static const char * g_szClassName_KviAvatarAdvancedOptionsWidget = "KviAvatarAdvancedOptionsWidget";
+static const char * g_szClassName_KviAvatarAdvancedOptionsWidget = "OptionsWidget_avatar";
 static const char * g_szName_KviAwayOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviAwayOptionsWidget;
-static const char * g_szClassName_KviAwayOptionsWidget = "KviAwayOptionsWidget";
+static const char * g_szClassName_KviAwayOptionsWidget = "OptionsWidget_away";
 static const char * g_szName_KviChannelOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviChannelOptionsWidget;
-static const char * g_szClassName_KviChannelOptionsWidget = "KviChannelOptionsWidget";
+static const char * g_szClassName_KviChannelOptionsWidget = "OptionsWidget_channel";
 static const char * g_szName_KviChannelGeneralOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviChannelGeneralOptionsWidget;
-static const char * g_szClassName_KviChannelGeneralOptionsWidget = "KviChannelGeneralOptionsWidget";
+static const char * g_szClassName_KviChannelGeneralOptionsWidget = "OptionsWidget_channelGeneral";
 static const char * g_szName_KviChannelAdvancedOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviChannelAdvancedOptionsWidget;
-static const char * g_szClassName_KviChannelAdvancedOptionsWidget = "KviChannelAdvancedOptionsWidget";
+static const char * g_szClassName_KviChannelAdvancedOptionsWidget = "OptionsWidget_channelAdvanced";
 static const char * g_szName_KviConnectionOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviConnectionOptionsWidget;
-static const char * g_szClassName_KviConnectionOptionsWidget = "KviConnectionOptionsWidget";
+static const char * g_szClassName_KviConnectionOptionsWidget = "OptionsWidget_connection";
 static const char * g_szName_KviConnectionAdvancedOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviConnectionAdvancedOptionsWidget;
-static const char * g_szClassName_KviConnectionAdvancedOptionsWidget = "KviConnectionAdvancedOptionsWidget";
+static const char * g_szClassName_KviConnectionAdvancedOptionsWidget = "OptionsWidget_connectionAdvanced";
 static const char * g_szName_KviSSLOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviSSLOptionsWidget;
-static const char * g_szClassName_KviSSLOptionsWidget = "KviSSLOptionsWidget";
+static const char * g_szClassName_KviSSLOptionsWidget = "OptionsWidget_connectionSsl";
 static const char * g_szName_KviTransportOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviTransportOptionsWidget;
-static const char * g_szClassName_KviTransportOptionsWidget = "KviTransportOptionsWidget";
+static const char * g_szClassName_KviTransportOptionsWidget = "OptionsWidget_connectionSocket";
 static const char * g_szName_KviIdentOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviIdentOptionsWidget;
-static const char * g_szClassName_KviIdentOptionsWidget = "KviIdentOptionsWidget";
+static const char * g_szClassName_KviIdentOptionsWidget = "OptionsWidget_identService";
 static const char * g_szName_KviCtcpOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviCtcpOptionsWidget;
-static const char * g_szClassName_KviCtcpOptionsWidget = "KviCtcpOptionsWidget";
+static const char * g_szClassName_KviCtcpOptionsWidget = "OptionsWidget_ctcp";
 static const char * g_szName_KviCtcpFloodProtectionOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviCtcpFloodProtectionOptionsWidget;
-static const char * g_szClassName_KviCtcpFloodProtectionOptionsWidget = "KviCtcpFloodProtectionOptionsWidget";
+static const char * g_szClassName_KviCtcpFloodProtectionOptionsWidget = "OptionsWidget_ctcpFloodProtection";
 static const char * g_szName_KviDccOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviDccOptionsWidget;
-static const char * g_szClassName_KviDccOptionsWidget = "KviDccOptionsWidget";
+static const char * g_szClassName_KviDccOptionsWidget = "OptionsWidget_dcc";
 static const char * g_szName_KviDccGeneralOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviDccGeneralOptionsWidget;
-static const char * g_szClassName_KviDccGeneralOptionsWidget = "KviDccGeneralOptionsWidget";
+static const char * g_szClassName_KviDccGeneralOptionsWidget = "OptionsWidget_dccGeneral";
 static const char * g_szName_KviDccAdvancedOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviDccAdvancedOptionsWidget;
-static const char * g_szClassName_KviDccAdvancedOptionsWidget = "KviDccAdvancedOptionsWidget";
+static const char * g_szClassName_KviDccAdvancedOptionsWidget = "OptionsWidget_dccAdvanced";
 static const char * g_szName_KviDccSendOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviDccSendOptionsWidget;
-static const char * g_szClassName_KviDccSendOptionsWidget = "KviDccSendOptionsWidget";
+static const char * g_szClassName_KviDccSendOptionsWidget = "OptionsWidget_dccSend";
 static const char * g_szName_KviDccSendGeneralOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviDccSendGeneralOptionsWidget;
-static const char * g_szClassName_KviDccSendGeneralOptionsWidget = "KviDccSendGeneralOptionsWidget";
+static const char * g_szClassName_KviDccSendGeneralOptionsWidget = "OptionsWidget_dccSendGeneral";
 static const char * g_szName_KviDccSendAdvancedOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviDccSendAdvancedOptionsWidget;
-static const char * g_szClassName_KviDccSendAdvancedOptionsWidget = "KviDccSendAdvancedOptionsWidget";
+static const char * g_szClassName_KviDccSendAdvancedOptionsWidget = "OptionsWidget_dccSendAdvanced";
 static const char * g_szName_KviDccChatOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviDccChatOptionsWidget;
-static const char * g_szClassName_KviDccChatOptionsWidget = "KviDccChatOptionsWidget";
+static const char * g_szClassName_KviDccChatOptionsWidget = "OptionsWidget_dccChat";
 static const char * g_szName_KviDccVoiceOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviDccVoiceOptionsWidget;
-static const char * g_szClassName_KviDccVoiceOptionsWidget = "KviDccVoiceOptionsWidget";
+static const char * g_szClassName_KviDccVoiceOptionsWidget = "OptionsWidget_dccVoice";
 static const char * g_szName_KviGeneralOptOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviGeneralOptOptionsWidget;
-static const char * g_szClassName_KviGeneralOptOptionsWidget = "KviGeneralOptOptionsWidget";
+static const char * g_szClassName_KviGeneralOptOptionsWidget = "OptionsWidget_general";
 static const char * g_szName_KviAlertHighlightingOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviAlertHighlightingOptionsWidget;
-static const char * g_szClassName_KviAlertHighlightingOptionsWidget = "KviAlertHighlightingOptionsWidget";
+static const char * g_szClassName_KviAlertHighlightingOptionsWidget = "OptionsWidget_alertsAndHighlighting";
 static const char * g_szName_KviHighlightingOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviHighlightingOptionsWidget;
-static const char * g_szClassName_KviHighlightingOptionsWidget = "KviHighlightingOptionsWidget";
+static const char * g_szClassName_KviHighlightingOptionsWidget = "OptionsWidget_highlighting";
 static const char * g_szName_KviAlertOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviAlertOptionsWidget;
-static const char * g_szClassName_KviAlertOptionsWidget = "KviAlertOptionsWidget";
+static const char * g_szClassName_KviAlertOptionsWidget = "OptionsWidget_alerts";
 static const char * g_szName_KviIdentityOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviIdentityOptionsWidget;
-static const char * g_szClassName_KviIdentityOptionsWidget = "KviIdentityOptionsWidget";
+static const char * g_szClassName_KviIdentityOptionsWidget = "OptionsWidget_identity";
 static const char * g_szName_KviIdentityGeneralOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviIdentityGeneralOptionsWidget;
 static const char * g_szClassName_KviIdentityGeneralOptionsWidget = "KviIdentityGeneralOptionsWidget";
 static const char * g_szName_KviIdentityAvatarOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviIdentityAvatarOptionsWidget;
-static const char * g_szClassName_KviIdentityAvatarOptionsWidget = "KviIdentityAvatarOptionsWidget";
+static const char * g_szClassName_KviIdentityAvatarOptionsWidget = "OptionsWidget_identityAvatar";
 static const char * g_szName_KviIdentityAdvancedOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviIdentityAdvancedOptionsWidget;
-static const char * g_szClassName_KviIdentityAdvancedOptionsWidget = "KviIdentityAdvancedOptionsWidget";
+static const char * g_szClassName_KviIdentityAdvancedOptionsWidget = "OptionsWidget_identityAdvanced";
 static const char * g_szName_KviIdentityProfileOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviIdentityProfileOptionsWidget;
-static const char * g_szClassName_KviIdentityProfileOptionsWidget = "KviIdentityProfileOptionsWidget";
+static const char * g_szClassName_KviIdentityProfileOptionsWidget = "OptionsWidget_identityProfile";
 static const char * g_szName_KviIgnoreOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviIgnoreOptionsWidget;
-static const char * g_szClassName_KviIgnoreOptionsWidget = "KviIgnoreOptionsWidget";
+static const char * g_szClassName_KviIgnoreOptionsWidget = "OptionsWidget_ignore";
 static const char * g_szName_KviInputLookOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviInputLookOptionsWidget;
-static const char * g_szClassName_KviInputLookOptionsWidget = "KviInputLookOptionsWidget";
+static const char * g_szClassName_KviInputLookOptionsWidget = "OptionsWidget_inputLook";
 static const char * g_szName_KviInputFeaturesOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviInputFeaturesOptionsWidget;
-static const char * g_szClassName_KviInputFeaturesOptionsWidget = "KviInputFeaturesOptionsWidget";
+static const char * g_szClassName_KviInputFeaturesOptionsWidget = "OptionsWidget_inputFeatures";
 static const char * g_szName_KviInterfaceFeaturesOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviInterfaceFeaturesOptionsWidget;
-static const char * g_szClassName_KviInterfaceFeaturesOptionsWidget = "KviInterfaceFeaturesOptionsWidget";
+static const char * g_szClassName_KviInterfaceFeaturesOptionsWidget = "OptionsWidget_interfaceFeatures";
 static const char * g_szName_KviThemeGeneralOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviThemeGeneralOptionsWidget;
-static const char * g_szClassName_KviThemeGeneralOptionsWidget = "KviThemeGeneralOptionsWidget";
+static const char * g_szClassName_KviThemeGeneralOptionsWidget = "OptionsWidget_theme";
 static const char * g_szName_KviThemeTransparencyOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviThemeTransparencyOptionsWidget;
-static const char * g_szClassName_KviThemeTransparencyOptionsWidget = "KviThemeTransparencyOptionsWidget";
+static const char * g_szClassName_KviThemeTransparencyOptionsWidget = "OptionsWidget_themeTransparency";
 static const char * g_szName_KviThemeMdiAreaOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviThemeMdiAreaOptionsWidget;
-static const char * g_szClassName_KviThemeMdiAreaOptionsWidget = "KviThemeMdiAreaOptionsWidget";
+static const char * g_szClassName_KviThemeMdiAreaOptionsWidget = "OptionsWidget_themeMdiArea";
 static const char * g_szName_KviThemeToolBarAppletsOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviThemeToolBarAppletsOptionsWidget;
-static const char * g_szClassName_KviThemeToolBarAppletsOptionsWidget = "KviThemeToolBarAppletsOptionsWidget";
+static const char * g_szClassName_KviThemeToolBarAppletsOptionsWidget = "OptionsWidget_themeToolBarApplets";
 static const char * g_szName_KviIrcOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviIrcOptionsWidget;
-static const char * g_szClassName_KviIrcOptionsWidget = "KviIrcOptionsWidget";
+static const char * g_szClassName_KviIrcOptionsWidget = "OptionsWidget_irc";
 static const char * g_szName_KviIrcGeneralOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviIrcGeneralOptionsWidget;
-static const char * g_szClassName_KviIrcGeneralOptionsWidget = "KviIrcGeneralOptionsWidget";
+static const char * g_szClassName_KviIrcGeneralOptionsWidget = "OptionsWidget_ircGeneral";
 static const char * g_szName_KviIrcAdvancedOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviIrcAdvancedOptionsWidget;
-static const char * g_szClassName_KviIrcAdvancedOptionsWidget = "KviIrcAdvancedOptionsWidget";
+static const char * g_szClassName_KviIrcAdvancedOptionsWidget = "OptionsWidget_ircAdvanced";
 static const char * g_szName_KviIrcOutputOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviIrcOutputOptionsWidget;
-static const char * g_szClassName_KviIrcOutputOptionsWidget = "KviIrcOutputOptionsWidget";
+static const char * g_szClassName_KviIrcOutputOptionsWidget = "OptionsWidget_ircOutput";
 static const char * g_szName_KviIrcViewThemeOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviIrcViewThemeOptionsWidget;
-static const char * g_szClassName_KviIrcViewThemeOptionsWidget = "KviIrcViewThemeOptionsWidget";
+static const char * g_szClassName_KviIrcViewThemeOptionsWidget = "OptionsWidget_ircViewTheme";
 static const char * g_szName_KviIrcViewLookOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviIrcViewLookOptionsWidget;
-static const char * g_szClassName_KviIrcViewLookOptionsWidget = "KviIrcViewLookOptionsWidget";
+static const char * g_szClassName_KviIrcViewLookOptionsWidget = "OptionsWidget_ircViewLook";
 static const char * g_szName_KviIrcViewFeaturesOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviIrcViewFeaturesOptionsWidget;
-static const char * g_szClassName_KviIrcViewFeaturesOptionsWidget = "KviIrcViewFeaturesOptionsWidget";
+static const char * g_szClassName_KviIrcViewFeaturesOptionsWidget = "OptionsWidget_ircViewFeatures";
 static const char * g_szName_KviIrcViewMarkerOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviIrcViewMarkerOptionsWidget;
-static const char * g_szClassName_KviIrcViewMarkerOptionsWidget = "KviIrcViewMarkerOptionsWidget";
+static const char * g_szClassName_KviIrcViewMarkerOptionsWidget = "OptionsWidget_ircViewMarker";
 static const char * g_szName_KviLagOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviLagOptionsWidget;
-static const char * g_szClassName_KviLagOptionsWidget = "KviLagOptionsWidget";
+static const char * g_szClassName_KviLagOptionsWidget = "OptionsWidget_lag";
 static const char * g_szName_KviLoggingOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviLoggingOptionsWidget;
-static const char * g_szClassName_KviLoggingOptionsWidget = "KviLoggingOptionsWidget";
+static const char * g_szClassName_KviLoggingOptionsWidget = "OptionsWidget_logging";
 static const char * g_szName_KviMediaTypesOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviMediaTypesOptionsWidget;
-static const char * g_szClassName_KviMediaTypesOptionsWidget = "KviMediaTypesOptionsWidget";
+static const char * g_szClassName_KviMediaTypesOptionsWidget = "OptionsWidget_mediaTypes";
 static const char * g_szName_KviMessageOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviMessageOptionsWidget;
-static const char * g_szClassName_KviMessageOptionsWidget = "KviMessageOptionsWidget";
+static const char * g_szClassName_KviMessageOptionsWidget = "OptionsWidget_message";
 static const char * g_szName_KviPrivmsgOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviPrivmsgOptionsWidget;
-static const char * g_szClassName_KviPrivmsgOptionsWidget = "KviPrivmsgOptionsWidget";
+static const char * g_szClassName_KviPrivmsgOptionsWidget = "OptionsWidget_privmsg";
 static const char * g_szName_KviTimestampOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviTimestampOptionsWidget;
-static const char * g_szClassName_KviTimestampOptionsWidget = "KviTimestampOptionsWidget";
+static const char * g_szClassName_KviTimestampOptionsWidget = "OptionsWidget_timestamp";
 static const char * g_szName_KviMessageColorsOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviMessageColorsOptionsWidget;
-static const char * g_szClassName_KviMessageColorsOptionsWidget = "KviMessageColorsOptionsWidget";
+static const char * g_szClassName_KviMessageColorsOptionsWidget = "OptionsWidget_messageColors";
 static const char * g_szName_KviStandardColorsOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviStandardColorsOptionsWidget;
-static const char * g_szClassName_KviStandardColorsOptionsWidget = "KviStandardColorsOptionsWidget";
+static const char * g_szClassName_KviStandardColorsOptionsWidget = "OptionsWidget_standardColors";
 static const char * g_szName_KviNickServOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviNickServOptionsWidget;
-static const char * g_szClassName_KviNickServOptionsWidget = "KviNickServOptionsWidget";
+static const char * g_szClassName_KviNickServOptionsWidget = "OptionsWidget_nickServ";
 static const char * g_szName_KviNotifierLookOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviNotifierLookOptionsWidget;
-static const char * g_szClassName_KviNotifierLookOptionsWidget = "KviNotifierLookOptionsWidget";
+static const char * g_szClassName_KviNotifierLookOptionsWidget = "OptionsWidget_notifierLook";
 static const char * g_szName_KviNotifierOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviNotifierOptionsWidget;
-static const char * g_szClassName_KviNotifierOptionsWidget = "KviNotifierOptionsWidget";
+static const char * g_szClassName_KviNotifierOptionsWidget = "OptionsWidget_notifier";
 static const char * g_szName_KviNotifyOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviNotifyOptionsWidget;
-static const char * g_szClassName_KviNotifyOptionsWidget = "KviNotifyOptionsWidget";
+static const char * g_szClassName_KviNotifyOptionsWidget = "OptionsWidget_notify";
 static const char * g_szName_KviProtectionOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviProtectionOptionsWidget;
-static const char * g_szClassName_KviProtectionOptionsWidget = "KviProtectionOptionsWidget";
+static const char * g_szClassName_KviProtectionOptionsWidget = "OptionsWidget_protection";
 static const char * g_szName_KviProxyOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviProxyOptionsWidget;
-static const char * g_szClassName_KviProxyOptionsWidget = "KviProxyOptionsWidget";
+static const char * g_szClassName_KviProxyOptionsWidget = "OptionsWidget_proxy";
 static const char * g_szName_KviQueryOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviQueryOptionsWidget;
-static const char * g_szClassName_KviQueryOptionsWidget = "KviQueryOptionsWidget";
+static const char * g_szClassName_KviQueryOptionsWidget = "OptionsWidget_query";
 static const char * g_szName_KviIrcServerOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviIrcServerOptionsWidget;
-static const char * g_szClassName_KviIrcServerOptionsWidget = "KviIrcServerOptionsWidget";
+static const char * g_szClassName_KviIrcServerOptionsWidget = "OptionsWidget_servers";
 static const char * g_szName_KviSoundOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviSoundOptionsWidget;
-static const char * g_szClassName_KviSoundOptionsWidget = "KviSoundOptionsWidget";
+static const char * g_szClassName_KviSoundOptionsWidget = "OptionsWidget_sound";
 static const char * g_szName_KviSoundGeneralOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviSoundGeneralOptionsWidget;
-static const char * g_szClassName_KviSoundGeneralOptionsWidget = "KviSoundGeneralOptionsWidget";
+static const char * g_szClassName_KviSoundGeneralOptionsWidget = "OptionsWidget_soundGeneral";
 static const char * g_szName_KviSoundsOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviSoundsOptionsWidget;
-static const char * g_szClassName_KviSoundsOptionsWidget = "KviSoundsOptionsWidget";
+static const char * g_szClassName_KviSoundsOptionsWidget = "OptionsWidget_sounds";
 static const char * g_szName_KviTextEncodingOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviTextEncodingOptionsWidget;
-static const char * g_szClassName_KviTextEncodingOptionsWidget = "KviTextEncodingOptionsWidget";
+static const char * g_szClassName_KviTextEncodingOptionsWidget = "OptionsWidget_textEncoding";
 static const char * g_szName_KviTextIconsOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviTextIconsOptionsWidget;
-static const char * g_szClassName_KviTextIconsOptionsWidget = "KviTextIconsOptionsWidget";
+static const char * g_szClassName_KviTextIconsOptionsWidget = "OptionsWidget_textIcons";
 static const char * g_szName_KviToolsOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviToolsOptionsWidget;
-static const char * g_szClassName_KviToolsOptionsWidget = "KviToolsOptionsWidget";
+static const char * g_szClassName_KviToolsOptionsWidget = "OptionsWidget_tools";
 static const char * g_szName_KviTopicLabelLookOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviTopicLabelLookOptionsWidget;
-static const char * g_szClassName_KviTopicLabelLookOptionsWidget = "KviTopicLabelLookOptionsWidget";
+static const char * g_szClassName_KviTopicLabelLookOptionsWidget = "OptionsWidget_topicLabel";
 static const char * g_szName_KviTrayOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviTrayOptionsWidget;
-static const char * g_szClassName_KviTrayOptionsWidget = "KviTrayOptionsWidget";
+static const char * g_szClassName_KviTrayOptionsWidget = "OptionsWidget_tray";
 static const char * g_szName_KviUParserOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviUParserOptionsWidget;
-static const char * g_szClassName_KviUParserOptionsWidget = "KviUParserOptionsWidget";
+static const char * g_szClassName_KviUParserOptionsWidget = "OptionsWidget_uparser";
 static const char * g_szName_KviUrlHandlersOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviUrlHandlersOptionsWidget;
-static const char * g_szClassName_KviUrlHandlersOptionsWidget = "KviUrlHandlersOptionsWidget";
+static const char * g_szClassName_KviUrlHandlersOptionsWidget = "OptionsWidget_urlHandlers";
 static const char * g_szName_KviUserListLookOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviUserListLookOptionsWidget;
-static const char * g_szClassName_KviUserListLookOptionsWidget = "KviUserListLookOptionsWidget";
+static const char * g_szClassName_KviUserListLookOptionsWidget = "OptionsWidget_userList";
 static const char * g_szName_KviUserListLookBackgroundOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviUserListLookBackgroundOptionsWidget;
-static const char * g_szClassName_KviUserListLookBackgroundOptionsWidget = "KviUserListLookBackgroundOptionsWidget";
+static const char * g_szClassName_KviUserListLookBackgroundOptionsWidget = "OptionsWidget_userListBackground";
 static const char * g_szName_KviUserListLookForegroundOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviUserListLookForegroundOptionsWidget;
-static const char * g_szClassName_KviUserListLookForegroundOptionsWidget = "KviUserListLookForegroundOptionsWidget";
+static const char * g_szClassName_KviUserListLookForegroundOptionsWidget = "OptionsWidget_userListForeground";
 static const char * g_szName_KviUserListGridOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviUserListGridOptionsWidget;
-static const char * g_szClassName_KviUserListGridOptionsWidget = "KviUserListGridOptionsWidget";
+static const char * g_szClassName_KviUserListGridOptionsWidget = "OptionsWidget_userListGrid";
 static const char * g_szName_KviUserListFeaturesOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviUserListFeaturesOptionsWidget;
-static const char * g_szClassName_KviUserListFeaturesOptionsWidget = "KviUserListFeaturesOptionsWidget";
+static const char * g_szClassName_KviUserListFeaturesOptionsWidget = "OptionsWidget_userListFeatures";
 static const char * g_szName_KviWindowListOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviWindowListOptionsWidget;
-static const char * g_szClassName_KviWindowListOptionsWidget = "KviWindowListOptionsWidget";
+static const char * g_szClassName_KviWindowListOptionsWidget = "OptionsWidget_windowList";
 static const char * g_szName_KviTreeWindowListOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviTreeWindowListOptionsWidget;
-static const char * g_szClassName_KviTreeWindowListOptionsWidget = "KviTreeWindowListOptionsWidget";
+static const char * g_szClassName_KviTreeWindowListOptionsWidget = "OptionsWidget_windowListTree";
 static const char * g_szName_KviTreeWindowListForegroundOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviTreeWindowListForegroundOptionsWidget;
-static const char * g_szClassName_KviTreeWindowListForegroundOptionsWidget = "KviTreeWindowListForegroundOptionsWidget";
+static const char * g_szClassName_KviTreeWindowListForegroundOptionsWidget = "OptionsWidget_windowListTreeForeground";
 static const char * g_szName_KviTreeWindowListBackgroundOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviTreeWindowListBackgroundOptionsWidget;
-static const char * g_szClassName_KviTreeWindowListBackgroundOptionsWidget = "KviTreeWindowListBackgroundOptionsWidget";
+static const char * g_szClassName_KviTreeWindowListBackgroundOptionsWidget = "OptionsWidget_windowListTreeBackground";
 static const char * g_szName_KviTreeWindowListFeaturesOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviTreeWindowListFeaturesOptionsWidget;
-static const char * g_szClassName_KviTreeWindowListFeaturesOptionsWidget = "KviTreeWindowListFeaturesOptionsWidget";
+static const char * g_szClassName_KviTreeWindowListFeaturesOptionsWidget = "OptionsWidget_windowListTreeFeatures";
 static const char * g_szName_KviClassicWindowListOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviClassicWindowListOptionsWidget;
-static const char * g_szClassName_KviClassicWindowListOptionsWidget = "KviClassicWindowListOptionsWidget";
+static const char * g_szClassName_KviClassicWindowListOptionsWidget = "OptionsWidget_windowListClassic";
 
-KviOptionsInstanceManager::KviOptionsInstanceManager()
+OptionsInstanceManager::OptionsInstanceManager()
 : QObject(0)
 {
 
 	//qDebug("Instantiating");
 	// Create the global widget dict : case sensitive, do not copy keys
-	m_pInstanceTree = new KviPointerList<KviOptionsWidgetInstanceEntry>;
+	m_pInstanceTree = new KviPointerList<OptionsWidgetInstanceEntry>;
 	m_pInstanceTree->setAutoDelete(true);
 
 
-	KviOptionsWidgetInstanceEntry * e0;
-	e0 = new KviOptionsWidgetInstanceEntry;
+	OptionsWidgetInstanceEntry * e0;
+	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classKviConnectionOptionsWidget_createInstanceProc;
 	e0->pWidget = 0;
 	e0->szClassName = g_szClassName_KviConnectionOptionsWidget;
@@ -704,11 +704,11 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviConnectionOptionsWidget,"options");
 	m_pInstanceTree->append(e0);
 
-	e0->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
+	e0->pChildList = new KviPointerList<OptionsWidgetInstanceEntry>;
 	e0->pChildList->setAutoDelete(true);
 
-		KviOptionsWidgetInstanceEntry * e1;
-		e1 = new KviOptionsWidgetInstanceEntry;
+		OptionsWidgetInstanceEntry * e1;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviConnectionAdvancedOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviConnectionAdvancedOptionsWidget;
@@ -741,11 +741,11 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviConnectionAdvancedOptionsWidget,"options");
 		e0->pChildList->append(e1);
 
-		e1->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
+		e1->pChildList = new KviPointerList<OptionsWidgetInstanceEntry>;
 		e1->pChildList->setAutoDelete(true);
 
-			KviOptionsWidgetInstanceEntry * e2;
-			e2 = new KviOptionsWidgetInstanceEntry;
+			OptionsWidgetInstanceEntry * e2;
+			e2 = new OptionsWidgetInstanceEntry;
 			e2->createProc = &classKviSSLOptionsWidget_createInstanceProc;
 			e2->pWidget = 0;
 			e2->szClassName = g_szClassName_KviSSLOptionsWidget;
@@ -779,7 +779,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			e1->pChildList->append(e2);
 			e2->pChildList = 0;
 
-			e2 = new KviOptionsWidgetInstanceEntry;
+			e2 = new OptionsWidgetInstanceEntry;
 			e2->createProc = &classKviTransportOptionsWidget_createInstanceProc;
 			e2->pWidget = 0;
 			e2->szClassName = g_szClassName_KviTransportOptionsWidget;
@@ -813,7 +813,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			e1->pChildList->append(e2);
 			e2->pChildList = 0;
 
-			e2 = new KviOptionsWidgetInstanceEntry;
+			e2 = new OptionsWidgetInstanceEntry;
 			e2->createProc = &classKviIdentOptionsWidget_createInstanceProc;
 			e2->pWidget = 0;
 			e2->szClassName = g_szClassName_KviIdentOptionsWidget;
@@ -847,7 +847,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			e1->pChildList->append(e2);
 			e2->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviProxyOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviProxyOptionsWidget;
@@ -881,7 +881,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-	e0 = new KviOptionsWidgetInstanceEntry;
+	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classKviDccOptionsWidget_createInstanceProc;
 	e0->pWidget = 0;
 	e0->szClassName = g_szClassName_KviDccOptionsWidget;
@@ -914,10 +914,10 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviDccOptionsWidget,"options");
 	m_pInstanceTree->append(e0);
 
-	e0->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
+	e0->pChildList = new KviPointerList<OptionsWidgetInstanceEntry>;
 	e0->pChildList->setAutoDelete(true);
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviDccGeneralOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviDccGeneralOptionsWidget;
@@ -951,7 +951,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviDccAdvancedOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviDccAdvancedOptionsWidget;
@@ -985,7 +985,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviDccSendOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviDccSendOptionsWidget;
@@ -1018,10 +1018,10 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviDccSendOptionsWidget,"options");
 		e0->pChildList->append(e1);
 
-		e1->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
+		e1->pChildList = new KviPointerList<OptionsWidgetInstanceEntry>;
 		e1->pChildList->setAutoDelete(true);
 
-			e2 = new KviOptionsWidgetInstanceEntry;
+			e2 = new OptionsWidgetInstanceEntry;
 			e2->createProc = &classKviDccSendGeneralOptionsWidget_createInstanceProc;
 			e2->pWidget = 0;
 			e2->szClassName = g_szClassName_KviDccSendGeneralOptionsWidget;
@@ -1055,7 +1055,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			e1->pChildList->append(e2);
 			e2->pChildList = 0;
 
-			e2 = new KviOptionsWidgetInstanceEntry;
+			e2 = new OptionsWidgetInstanceEntry;
 			e2->createProc = &classKviDccSendAdvancedOptionsWidget_createInstanceProc;
 			e2->pWidget = 0;
 			e2->szClassName = g_szClassName_KviDccSendAdvancedOptionsWidget;
@@ -1089,7 +1089,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			e1->pChildList->append(e2);
 			e2->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviDccChatOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviDccChatOptionsWidget;
@@ -1123,7 +1123,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviDccVoiceOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviDccVoiceOptionsWidget;
@@ -1157,7 +1157,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-	e0 = new KviOptionsWidgetInstanceEntry;
+	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classKviGeneralOptOptionsWidget_createInstanceProc;
 	e0->pWidget = 0;
 	e0->szClassName = g_szClassName_KviGeneralOptOptionsWidget;
@@ -1190,10 +1190,10 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviGeneralOptOptionsWidget,"options");
 	m_pInstanceTree->append(e0);
 
-	e0->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
+	e0->pChildList = new KviPointerList<OptionsWidgetInstanceEntry>;
 	e0->pChildList->setAutoDelete(true);
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviMediaTypesOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviMediaTypesOptionsWidget;
@@ -1227,7 +1227,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviSoundOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviSoundOptionsWidget;
@@ -1260,10 +1260,10 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviSoundOptionsWidget,"options");
 		e0->pChildList->append(e1);
 
-		e1->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
+		e1->pChildList = new KviPointerList<OptionsWidgetInstanceEntry>;
 		e1->pChildList->setAutoDelete(true);
 
-			e2 = new KviOptionsWidgetInstanceEntry;
+			e2 = new OptionsWidgetInstanceEntry;
 			e2->createProc = &classKviSoundGeneralOptionsWidget_createInstanceProc;
 			e2->pWidget = 0;
 			e2->szClassName = g_szClassName_KviSoundGeneralOptionsWidget;
@@ -1297,7 +1297,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			e1->pChildList->append(e2);
 			e2->pChildList = 0;
 
-			e2 = new KviOptionsWidgetInstanceEntry;
+			e2 = new OptionsWidgetInstanceEntry;
 			e2->createProc = &classKviSoundsOptionsWidget_createInstanceProc;
 			e2->pWidget = 0;
 			e2->szClassName = g_szClassName_KviSoundsOptionsWidget;
@@ -1331,7 +1331,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			e1->pChildList->append(e2);
 			e2->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviTextEncodingOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviTextEncodingOptionsWidget;
@@ -1365,7 +1365,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviUParserOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviUParserOptionsWidget;
@@ -1399,7 +1399,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviUrlHandlersOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviUrlHandlersOptionsWidget;
@@ -1433,7 +1433,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-	e0 = new KviOptionsWidgetInstanceEntry;
+	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classKviIdentityOptionsWidget_createInstanceProc;
 	e0->pWidget = 0;
 	e0->szClassName = g_szClassName_KviIdentityOptionsWidget;
@@ -1466,10 +1466,10 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviIdentityOptionsWidget,"options");
 	m_pInstanceTree->append(e0);
 
-	e0->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
+	e0->pChildList = new KviPointerList<OptionsWidgetInstanceEntry>;
 	e0->pChildList->setAutoDelete(true);
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviIdentityGeneralOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviIdentityGeneralOptionsWidget;
@@ -1503,7 +1503,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviIdentityAvatarOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviIdentityAvatarOptionsWidget;
@@ -1537,7 +1537,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviIdentityAdvancedOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviIdentityAdvancedOptionsWidget;
@@ -1571,7 +1571,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviIdentityProfileOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviIdentityProfileOptionsWidget;
@@ -1605,7 +1605,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-	e0 = new KviOptionsWidgetInstanceEntry;
+	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classKviInputLookOptionsWidget_createInstanceProc;
 	e0->pWidget = 0;
 	e0->szClassName = g_szClassName_KviInputLookOptionsWidget;
@@ -1639,7 +1639,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	m_pInstanceTree->append(e0);
 	e0->pChildList = 0;
 
-	e0 = new KviOptionsWidgetInstanceEntry;
+	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classKviInterfaceFeaturesOptionsWidget_createInstanceProc;
 	e0->pWidget = 0;
 	e0->szClassName = g_szClassName_KviInterfaceFeaturesOptionsWidget;
@@ -1672,10 +1672,10 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviInterfaceFeaturesOptionsWidget,"options");
 	m_pInstanceTree->append(e0);
 
-	e0->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
+	e0->pChildList = new KviPointerList<OptionsWidgetInstanceEntry>;
 	e0->pChildList->setAutoDelete(true);
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviInputFeaturesOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviInputFeaturesOptionsWidget;
@@ -1709,7 +1709,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviNotifierOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviNotifierOptionsWidget;
@@ -1743,7 +1743,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviTrayOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviTrayOptionsWidget;
@@ -1777,7 +1777,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-	e0 = new KviOptionsWidgetInstanceEntry;
+	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classKviThemeGeneralOptionsWidget_createInstanceProc;
 	e0->pWidget = 0;
 	e0->szClassName = g_szClassName_KviThemeGeneralOptionsWidget;
@@ -1811,7 +1811,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	m_pInstanceTree->append(e0);
 	e0->pChildList = 0;
 
-	e0 = new KviOptionsWidgetInstanceEntry;
+	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classKviThemeTransparencyOptionsWidget_createInstanceProc;
 	e0->pWidget = 0;
 	e0->szClassName = g_szClassName_KviThemeTransparencyOptionsWidget;
@@ -1845,7 +1845,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	m_pInstanceTree->append(e0);
 	e0->pChildList = 0;
 
-	e0 = new KviOptionsWidgetInstanceEntry;
+	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classKviThemeMdiAreaOptionsWidget_createInstanceProc;
 	e0->pWidget = 0;
 	e0->szClassName = g_szClassName_KviThemeMdiAreaOptionsWidget;
@@ -1879,7 +1879,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	m_pInstanceTree->append(e0);
 	e0->pChildList = 0;
 
-	e0 = new KviOptionsWidgetInstanceEntry;
+	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classKviThemeToolBarAppletsOptionsWidget_createInstanceProc;
 	e0->pWidget = 0;
 	e0->szClassName = g_szClassName_KviThemeToolBarAppletsOptionsWidget;
@@ -1913,7 +1913,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	m_pInstanceTree->append(e0);
 	e0->pChildList = 0;
 
-	e0 = new KviOptionsWidgetInstanceEntry;
+	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classKviIrcOptionsWidget_createInstanceProc;
 	e0->pWidget = 0;
 	e0->szClassName = g_szClassName_KviIrcOptionsWidget;
@@ -1946,10 +1946,10 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviIrcOptionsWidget,"options");
 	m_pInstanceTree->append(e0);
 
-	e0->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
+	e0->pChildList = new KviPointerList<OptionsWidgetInstanceEntry>;
 	e0->pChildList->setAutoDelete(true);
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviChannelOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviChannelOptionsWidget;
@@ -1982,10 +1982,10 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviChannelOptionsWidget,"options");
 		e0->pChildList->append(e1);
 
-		e1->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
+		e1->pChildList = new KviPointerList<OptionsWidgetInstanceEntry>;
 		e1->pChildList->setAutoDelete(true);
 
-			e2 = new KviOptionsWidgetInstanceEntry;
+			e2 = new OptionsWidgetInstanceEntry;
 			e2->createProc = &classKviChannelGeneralOptionsWidget_createInstanceProc;
 			e2->pWidget = 0;
 			e2->szClassName = g_szClassName_KviChannelGeneralOptionsWidget;
@@ -2019,7 +2019,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			e1->pChildList->append(e2);
 			e2->pChildList = 0;
 
-			e2 = new KviOptionsWidgetInstanceEntry;
+			e2 = new OptionsWidgetInstanceEntry;
 			e2->createProc = &classKviChannelAdvancedOptionsWidget_createInstanceProc;
 			e2->pWidget = 0;
 			e2->szClassName = g_szClassName_KviChannelAdvancedOptionsWidget;
@@ -2053,7 +2053,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			e1->pChildList->append(e2);
 			e2->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviIrcGeneralOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviIrcGeneralOptionsWidget;
@@ -2087,7 +2087,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviIrcAdvancedOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviIrcAdvancedOptionsWidget;
@@ -2121,7 +2121,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviIrcOutputOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviIrcOutputOptionsWidget;
@@ -2155,7 +2155,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviProtectionOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviProtectionOptionsWidget;
@@ -2188,10 +2188,10 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviProtectionOptionsWidget,"options");
 		e0->pChildList->append(e1);
 
-		e1->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
+		e1->pChildList = new KviPointerList<OptionsWidgetInstanceEntry>;
 		e1->pChildList->setAutoDelete(true);
 
-			e2 = new KviOptionsWidgetInstanceEntry;
+			e2 = new OptionsWidgetInstanceEntry;
 			e2->createProc = &classKviAntispamOptionsWidget_createInstanceProc;
 			e2->pWidget = 0;
 			e2->szClassName = g_szClassName_KviAntispamOptionsWidget;
@@ -2225,7 +2225,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			e1->pChildList->append(e2);
 			e2->pChildList = 0;
 
-			e2 = new KviOptionsWidgetInstanceEntry;
+			e2 = new OptionsWidgetInstanceEntry;
 			e2->createProc = &classKviCtcpFloodProtectionOptionsWidget_createInstanceProc;
 			e2->pWidget = 0;
 			e2->szClassName = g_szClassName_KviCtcpFloodProtectionOptionsWidget;
@@ -2259,7 +2259,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			e1->pChildList->append(e2);
 			e2->pChildList = 0;
 
-			e2 = new KviOptionsWidgetInstanceEntry;
+			e2 = new OptionsWidgetInstanceEntry;
 			e2->createProc = &classKviIgnoreOptionsWidget_createInstanceProc;
 			e2->pWidget = 0;
 			e2->szClassName = g_szClassName_KviIgnoreOptionsWidget;
@@ -2293,7 +2293,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			e1->pChildList->append(e2);
 			e2->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviQueryOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviQueryOptionsWidget;
@@ -2327,7 +2327,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviToolsOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviToolsOptionsWidget;
@@ -2360,10 +2360,10 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviToolsOptionsWidget,"options");
 		e0->pChildList->append(e1);
 
-		e1->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
+		e1->pChildList = new KviPointerList<OptionsWidgetInstanceEntry>;
 		e1->pChildList->setAutoDelete(true);
 
-			e2 = new KviOptionsWidgetInstanceEntry;
+			e2 = new OptionsWidgetInstanceEntry;
 			e2->createProc = &classKviAvatarAdvancedOptionsWidget_createInstanceProc;
 			e2->pWidget = 0;
 			e2->szClassName = g_szClassName_KviAvatarAdvancedOptionsWidget;
@@ -2397,7 +2397,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			e1->pChildList->append(e2);
 			e2->pChildList = 0;
 
-			e2 = new KviOptionsWidgetInstanceEntry;
+			e2 = new OptionsWidgetInstanceEntry;
 			e2->createProc = &classKviAwayOptionsWidget_createInstanceProc;
 			e2->pWidget = 0;
 			e2->szClassName = g_szClassName_KviAwayOptionsWidget;
@@ -2431,7 +2431,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			e1->pChildList->append(e2);
 			e2->pChildList = 0;
 
-			e2 = new KviOptionsWidgetInstanceEntry;
+			e2 = new OptionsWidgetInstanceEntry;
 			e2->createProc = &classKviCtcpOptionsWidget_createInstanceProc;
 			e2->pWidget = 0;
 			e2->szClassName = g_szClassName_KviCtcpOptionsWidget;
@@ -2465,7 +2465,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			e1->pChildList->append(e2);
 			e2->pChildList = 0;
 
-			e2 = new KviOptionsWidgetInstanceEntry;
+			e2 = new OptionsWidgetInstanceEntry;
 			e2->createProc = &classKviAlertHighlightingOptionsWidget_createInstanceProc;
 			e2->pWidget = 0;
 			e2->szClassName = g_szClassName_KviAlertHighlightingOptionsWidget;
@@ -2498,11 +2498,11 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			e2->szName = __tr2qs_ctx_no_xgettext(g_szName_KviAlertHighlightingOptionsWidget,"options");
 			e1->pChildList->append(e2);
 
-			e2->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
+			e2->pChildList = new KviPointerList<OptionsWidgetInstanceEntry>;
 			e2->pChildList->setAutoDelete(true);
 
-				KviOptionsWidgetInstanceEntry * e3;
-				e3 = new KviOptionsWidgetInstanceEntry;
+				OptionsWidgetInstanceEntry * e3;
+				e3 = new OptionsWidgetInstanceEntry;
 				e3->createProc = &classKviHighlightingOptionsWidget_createInstanceProc;
 				e3->pWidget = 0;
 				e3->szClassName = g_szClassName_KviHighlightingOptionsWidget;
@@ -2536,7 +2536,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 				e2->pChildList->append(e3);
 				e3->pChildList = 0;
 
-				e3 = new KviOptionsWidgetInstanceEntry;
+				e3 = new OptionsWidgetInstanceEntry;
 				e3->createProc = &classKviAlertOptionsWidget_createInstanceProc;
 				e3->pWidget = 0;
 				e3->szClassName = g_szClassName_KviAlertOptionsWidget;
@@ -2570,7 +2570,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 				e2->pChildList->append(e3);
 				e3->pChildList = 0;
 
-			e2 = new KviOptionsWidgetInstanceEntry;
+			e2 = new OptionsWidgetInstanceEntry;
 			e2->createProc = &classKviLagOptionsWidget_createInstanceProc;
 			e2->pWidget = 0;
 			e2->szClassName = g_szClassName_KviLagOptionsWidget;
@@ -2604,7 +2604,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			e1->pChildList->append(e2);
 			e2->pChildList = 0;
 
-			e2 = new KviOptionsWidgetInstanceEntry;
+			e2 = new OptionsWidgetInstanceEntry;
 			e2->createProc = &classKviLoggingOptionsWidget_createInstanceProc;
 			e2->pWidget = 0;
 			e2->szClassName = g_szClassName_KviLoggingOptionsWidget;
@@ -2638,7 +2638,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			e1->pChildList->append(e2);
 			e2->pChildList = 0;
 
-			e2 = new KviOptionsWidgetInstanceEntry;
+			e2 = new OptionsWidgetInstanceEntry;
 			e2->createProc = &classKviNickServOptionsWidget_createInstanceProc;
 			e2->pWidget = 0;
 			e2->szClassName = g_szClassName_KviNickServOptionsWidget;
@@ -2672,7 +2672,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			e1->pChildList->append(e2);
 			e2->pChildList = 0;
 
-			e2 = new KviOptionsWidgetInstanceEntry;
+			e2 = new OptionsWidgetInstanceEntry;
 			e2->createProc = &classKviNotifyOptionsWidget_createInstanceProc;
 			e2->pWidget = 0;
 			e2->szClassName = g_szClassName_KviNotifyOptionsWidget;
@@ -2706,7 +2706,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			e1->pChildList->append(e2);
 			e2->pChildList = 0;
 
-			e2 = new KviOptionsWidgetInstanceEntry;
+			e2 = new OptionsWidgetInstanceEntry;
 			e2->createProc = &classKviTextIconsOptionsWidget_createInstanceProc;
 			e2->pWidget = 0;
 			e2->szClassName = g_szClassName_KviTextIconsOptionsWidget;
@@ -2740,7 +2740,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			e1->pChildList->append(e2);
 			e2->pChildList = 0;
 
-	e0 = new KviOptionsWidgetInstanceEntry;
+	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classKviIrcViewThemeOptionsWidget_createInstanceProc;
 	e0->pWidget = 0;
 	e0->szClassName = g_szClassName_KviIrcViewThemeOptionsWidget;
@@ -2773,10 +2773,10 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviIrcViewThemeOptionsWidget,"options");
 	m_pInstanceTree->append(e0);
 
-	e0->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
+	e0->pChildList = new KviPointerList<OptionsWidgetInstanceEntry>;
 	e0->pChildList->setAutoDelete(true);
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviIrcViewLookOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviIrcViewLookOptionsWidget;
@@ -2810,7 +2810,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviIrcViewFeaturesOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviIrcViewFeaturesOptionsWidget;
@@ -2844,7 +2844,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviIrcViewMarkerOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviIrcViewMarkerOptionsWidget;
@@ -2878,7 +2878,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-	e0 = new KviOptionsWidgetInstanceEntry;
+	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classKviMessageOptionsWidget_createInstanceProc;
 	e0->pWidget = 0;
 	e0->szClassName = g_szClassName_KviMessageOptionsWidget;
@@ -2911,10 +2911,10 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviMessageOptionsWidget,"options");
 	m_pInstanceTree->append(e0);
 
-	e0->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
+	e0->pChildList = new KviPointerList<OptionsWidgetInstanceEntry>;
 	e0->pChildList->setAutoDelete(true);
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviPrivmsgOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviPrivmsgOptionsWidget;
@@ -2948,7 +2948,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviTimestampOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviTimestampOptionsWidget;
@@ -2982,7 +2982,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviMessageColorsOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviMessageColorsOptionsWidget;
@@ -3016,7 +3016,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviStandardColorsOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviStandardColorsOptionsWidget;
@@ -3050,7 +3050,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-	e0 = new KviOptionsWidgetInstanceEntry;
+	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classKviNotifierLookOptionsWidget_createInstanceProc;
 	e0->pWidget = 0;
 	e0->szClassName = g_szClassName_KviNotifierLookOptionsWidget;
@@ -3084,7 +3084,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	m_pInstanceTree->append(e0);
 	e0->pChildList = 0;
 
-	e0 = new KviOptionsWidgetInstanceEntry;
+	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classKviIrcServerOptionsWidget_createInstanceProc;
 	e0->pWidget = 0;
 	e0->szClassName = g_szClassName_KviIrcServerOptionsWidget;
@@ -3118,7 +3118,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	m_pInstanceTree->append(e0);
 	e0->pChildList = 0;
 
-	e0 = new KviOptionsWidgetInstanceEntry;
+	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classKviTopicLabelLookOptionsWidget_createInstanceProc;
 	e0->pWidget = 0;
 	e0->szClassName = g_szClassName_KviTopicLabelLookOptionsWidget;
@@ -3152,7 +3152,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	m_pInstanceTree->append(e0);
 	e0->pChildList = 0;
 
-	e0 = new KviOptionsWidgetInstanceEntry;
+	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classKviUserListLookOptionsWidget_createInstanceProc;
 	e0->pWidget = 0;
 	e0->szClassName = g_szClassName_KviUserListLookOptionsWidget;
@@ -3185,10 +3185,10 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviUserListLookOptionsWidget,"options");
 	m_pInstanceTree->append(e0);
 
-	e0->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
+	e0->pChildList = new KviPointerList<OptionsWidgetInstanceEntry>;
 	e0->pChildList->setAutoDelete(true);
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviUserListLookBackgroundOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviUserListLookBackgroundOptionsWidget;
@@ -3222,7 +3222,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviUserListLookForegroundOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviUserListLookForegroundOptionsWidget;
@@ -3256,7 +3256,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviUserListGridOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviUserListGridOptionsWidget;
@@ -3290,7 +3290,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviUserListFeaturesOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviUserListFeaturesOptionsWidget;
@@ -3324,7 +3324,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-	e0 = new KviOptionsWidgetInstanceEntry;
+	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classKviWindowListOptionsWidget_createInstanceProc;
 	e0->pWidget = 0;
 	e0->szClassName = g_szClassName_KviWindowListOptionsWidget;
@@ -3357,10 +3357,10 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviWindowListOptionsWidget,"options");
 	m_pInstanceTree->append(e0);
 
-	e0->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
+	e0->pChildList = new KviPointerList<OptionsWidgetInstanceEntry>;
 	e0->pChildList->setAutoDelete(true);
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviTreeWindowListOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviTreeWindowListOptionsWidget;
@@ -3393,10 +3393,10 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviTreeWindowListOptionsWidget,"options");
 		e0->pChildList->append(e1);
 
-		e1->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
+		e1->pChildList = new KviPointerList<OptionsWidgetInstanceEntry>;
 		e1->pChildList->setAutoDelete(true);
 
-			e2 = new KviOptionsWidgetInstanceEntry;
+			e2 = new OptionsWidgetInstanceEntry;
 			e2->createProc = &classKviTreeWindowListForegroundOptionsWidget_createInstanceProc;
 			e2->pWidget = 0;
 			e2->szClassName = g_szClassName_KviTreeWindowListForegroundOptionsWidget;
@@ -3430,7 +3430,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			e1->pChildList->append(e2);
 			e2->pChildList = 0;
 
-			e2 = new KviOptionsWidgetInstanceEntry;
+			e2 = new OptionsWidgetInstanceEntry;
 			e2->createProc = &classKviTreeWindowListBackgroundOptionsWidget_createInstanceProc;
 			e2->pWidget = 0;
 			e2->szClassName = g_szClassName_KviTreeWindowListBackgroundOptionsWidget;
@@ -3464,7 +3464,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			e1->pChildList->append(e2);
 			e2->pChildList = 0;
 
-			e2 = new KviOptionsWidgetInstanceEntry;
+			e2 = new OptionsWidgetInstanceEntry;
 			e2->createProc = &classKviTreeWindowListFeaturesOptionsWidget_createInstanceProc;
 			e2->pWidget = 0;
 			e2->szClassName = g_szClassName_KviTreeWindowListFeaturesOptionsWidget;
@@ -3498,7 +3498,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			e1->pChildList->append(e2);
 			e2->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviClassicWindowListOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviClassicWindowListOptionsWidget;
@@ -3534,15 +3534,15 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 
 }
 
-void KviOptionsInstanceManager::deleteInstanceTree(KviPointerList<KviOptionsWidgetInstanceEntry> * l)
+void OptionsInstanceManager::deleteInstanceTree(KviPointerList<OptionsWidgetInstanceEntry> * l)
 {
 	if(l)
 	{
-		for(KviOptionsWidgetInstanceEntry * e = l->first();e;e = l->next())
+		for(OptionsWidgetInstanceEntry * e = l->first();e;e = l->next())
 		{
 			if(e->pWidget)
 			{
-				if(e->pWidget->parent()->inherits("KviOptionsWidgetContainer"))
+				if(e->pWidget->parent()->inherits("OptionsWidgetContainer"))
 				{
 					disconnect(e->pWidget,SIGNAL(destroyed()),this,SLOT(widgetDestroyed()));
 					delete e->pWidget->parent();
@@ -3558,21 +3558,21 @@ void KviOptionsInstanceManager::deleteInstanceTree(KviPointerList<KviOptionsWidg
 }
 
 
-KviOptionsInstanceManager::~KviOptionsInstanceManager()
+OptionsInstanceManager::~OptionsInstanceManager()
 {
 	if(m_pInstanceTree)
-		qDebug("Ops...KviOptionsInstanceManager::cleanup() not called ?");
+		qDebug("Ops...OptionsInstanceManager::cleanup() not called ?");
 }
 
-void KviOptionsInstanceManager::cleanup(KviModule *)
+void OptionsInstanceManager::cleanup(KviModule *)
 {
 	deleteInstanceTree(m_pInstanceTree);
 	m_pInstanceTree = 0;
 }
 
-void KviOptionsInstanceManager::widgetDestroyed()
+void OptionsInstanceManager::widgetDestroyed()
 {
-	KviOptionsWidgetInstanceEntry * e = findInstanceEntry(sender(),m_pInstanceTree);
+	OptionsWidgetInstanceEntry * e = findInstanceEntry(sender(),m_pInstanceTree);
 	if(e)
 		e->pWidget = 0;
 	if(g_iOptionWidgetInstances > 0)
@@ -3580,7 +3580,7 @@ void KviOptionsInstanceManager::widgetDestroyed()
 
 }
 
-KviOptionsWidget * KviOptionsInstanceManager::getInstance(KviOptionsWidgetInstanceEntry * e,QWidget * par)
+KviOptionsWidget * OptionsInstanceManager::getInstance(OptionsWidgetInstanceEntry * e,QWidget * par)
 {
 	if(!e)
 		return NULL;
@@ -3609,7 +3609,7 @@ KviOptionsWidget * KviOptionsInstanceManager::getInstance(KviOptionsWidgetInstan
 	{
 		QWidget * oldPar = (QWidget *)e->pWidget->parent();
 		e->pWidget->setParent(par); //reparent(par,QPoint(0,0));
-		if(oldPar->inherits("KviOptionsWidgetContainer"))
+		if(oldPar->inherits("OptionsWidgetContainer"))
 			delete oldPar;
 		// else it's very likely a QStackedWidget, child of a KviOptionsWidget: don't delete
 	}
@@ -3620,15 +3620,15 @@ KviOptionsWidget * KviOptionsInstanceManager::getInstance(KviOptionsWidgetInstan
 		e->pWidget->createTabbedPage();
 		if(e->pChildList)
 		{
-			KviPointerList<KviOptionsWidgetInstanceEntry> tmp;
+			KviPointerList<OptionsWidgetInstanceEntry> tmp;
 			tmp.setAutoDelete(false);
 
-			for(KviOptionsWidgetInstanceEntry * e2 = e->pChildList->first();e2;e2 = e->pChildList->next())
+			for(OptionsWidgetInstanceEntry * e2 = e->pChildList->first();e2;e2 = e->pChildList->next())
 			{
 				// add only non containers and widgets not explicitly marked as noncontained
 				if((!e2->bIsContainer) && (!e2->bIsNotContained))
 				{
-					KviOptionsWidgetInstanceEntry * ee = tmp.first();
+					OptionsWidgetInstanceEntry * ee = tmp.first();
 					int idx = 0;
 					while(ee)
 					{
@@ -3640,7 +3640,7 @@ KviOptionsWidget * KviOptionsInstanceManager::getInstance(KviOptionsWidgetInstan
 				}
 			}
 
-			for(KviOptionsWidgetInstanceEntry * e3 = tmp.last();e3;e3 = tmp.prev())
+			for(OptionsWidgetInstanceEntry * e3 = tmp.last();e3;e3 = tmp.prev())
 			{
 				KviOptionsWidget * ow = getInstance(e3,e->pWidget->tabWidget());
 				e->pWidget->addOptionsWidget(e3->szName,*(g_pIconManager->getSmallIcon(e3->iIcon)),ow);
@@ -3650,16 +3650,16 @@ KviOptionsWidget * KviOptionsInstanceManager::getInstance(KviOptionsWidgetInstan
 	return e->pWidget;
 }
 
-KviOptionsWidgetInstanceEntry * KviOptionsInstanceManager::findInstanceEntry(const QObject * ptr,KviPointerList<KviOptionsWidgetInstanceEntry> * l)
+OptionsWidgetInstanceEntry * OptionsInstanceManager::findInstanceEntry(const QObject * ptr,KviPointerList<OptionsWidgetInstanceEntry> * l)
 {
 	if(l)
 	{
-		for(KviOptionsWidgetInstanceEntry * e = l->first();e;e = l->next())
+		for(OptionsWidgetInstanceEntry * e = l->first();e;e = l->next())
 		{
 			if(ptr == e->pWidget)return e;
 			if(e->pChildList)
 			{
-				KviOptionsWidgetInstanceEntry * e2 = findInstanceEntry(ptr,e->pChildList);
+				OptionsWidgetInstanceEntry * e2 = findInstanceEntry(ptr,e->pChildList);
 				if(e2)return e2;
 			}
 		}
@@ -3667,16 +3667,16 @@ KviOptionsWidgetInstanceEntry * KviOptionsInstanceManager::findInstanceEntry(con
 	return 0;
 }
 
-KviOptionsWidgetInstanceEntry * KviOptionsInstanceManager::findInstanceEntry(const char * clName,KviPointerList<KviOptionsWidgetInstanceEntry> * l)
+OptionsWidgetInstanceEntry * OptionsInstanceManager::findInstanceEntry(const char * clName,KviPointerList<OptionsWidgetInstanceEntry> * l)
 {
 	if(l)
 	{
-		for(KviOptionsWidgetInstanceEntry * e = l->first();e;e = l->next())
+		for(OptionsWidgetInstanceEntry * e = l->first();e;e = l->next())
 		{
 			if(kvi_strEqualCI(e->szClassName,clName))return e;
 			if(e->pChildList)
 			{
-				KviOptionsWidgetInstanceEntry * e2 = findInstanceEntry(clName,e->pChildList);
+				OptionsWidgetInstanceEntry * e2 = findInstanceEntry(clName,e->pChildList);
 				if(e2)return e2;
 			}
 		}
@@ -3684,12 +3684,12 @@ KviOptionsWidgetInstanceEntry * KviOptionsInstanceManager::findInstanceEntry(con
 	return 0;
 }
 
-KviOptionsWidgetInstanceEntry * KviOptionsInstanceManager::findInstanceEntry(const char * clName)
+OptionsWidgetInstanceEntry * OptionsInstanceManager::findInstanceEntry(const char * clName)
 {
 	return findInstanceEntry(clName,m_pInstanceTree);
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-	#include "m_instances.moc"
+	#include "m_OptionsInstanceManager.moc"
 #endif
 
diff --git a/src/modules/options/instances.h b/src/modules/options/OptionsInstanceManager.h
index 99e9d8d8e..0380c9ca0 100644
--- a/src/modules/options/instances.h
+++ b/src/modules/options/OptionsInstanceManager.h
@@ -5,7 +5,7 @@
 
 //=============================================================================
 //
-//   File : instances.h
+//   File : OptionsInstanceManager.h
 //
 //   This file is part of the KVIrc irc client distribution
 //   Copyright (C) 2001-2008 Szymon Stefanek (pragma at kvirc dot net)
@@ -38,10 +38,10 @@
 #include "KviPointerList.h"
 #include "KviQString.h"
 
-typedef struct _KviOptionsWidgetInstanceEntry KviOptionsWidgetInstanceEntry;
+typedef struct _OptionsWidgetInstanceEntry OptionsWidgetInstanceEntry;
 
 
-typedef struct _KviOptionsWidgetInstanceEntry
+typedef struct _OptionsWidgetInstanceEntry
 {
 	KviOptionsWidget                          * (*createProc)(QWidget *);
 	KviOptionsWidget                          * pWidget;   // singleton
@@ -55,28 +55,28 @@ typedef struct _KviOptionsWidgetInstanceEntry
 	QString                                     szGroup;
 	bool                                        bIsContainer;
 	bool                                        bIsNotContained;
-	KviPointerList<KviOptionsWidgetInstanceEntry> * pChildList;
-	bool                                        bDoInsert; // a helper for KviOptionsDialog::fillListView()
-} KviOptionsWidgetInstanceEntry;
+	KviPointerList<OptionsWidgetInstanceEntry> * pChildList;
+	bool                                        bDoInsert; // a helper for OptionsDialog::fillListView()
+} OptionsWidgetInstanceEntry;
 
 
-class KviOptionsInstanceManager : public QObject
+class OptionsInstanceManager : public QObject
 {
 	Q_OBJECT
 public:
-	KviOptionsInstanceManager();
-	virtual ~KviOptionsInstanceManager();
+	OptionsInstanceManager();
+	virtual ~OptionsInstanceManager();
 protected:
-	KviPointerList<KviOptionsWidgetInstanceEntry> *  m_pInstanceTree;
+	KviPointerList<OptionsWidgetInstanceEntry> *  m_pInstanceTree;
 public:
-	KviPointerList<KviOptionsWidgetInstanceEntry> * instanceEntryTree(){ return m_pInstanceTree; };
-	KviOptionsWidget * getInstance(KviOptionsWidgetInstanceEntry * e,QWidget * par);
-	KviOptionsWidgetInstanceEntry * findInstanceEntry(const char * clName);
+	KviPointerList<OptionsWidgetInstanceEntry> * instanceEntryTree(){ return m_pInstanceTree; };
+	KviOptionsWidget * getInstance(OptionsWidgetInstanceEntry * e,QWidget * par);
+	OptionsWidgetInstanceEntry * findInstanceEntry(const char * clName);
 	void cleanup(KviModule * m);
 protected:
-	KviOptionsWidgetInstanceEntry * findInstanceEntry(const char * clName,KviPointerList<KviOptionsWidgetInstanceEntry> * l);
-	KviOptionsWidgetInstanceEntry * findInstanceEntry(const QObject * ptr,KviPointerList<KviOptionsWidgetInstanceEntry> * l);
-	void deleteInstanceTree(KviPointerList<KviOptionsWidgetInstanceEntry> * l);
+	OptionsWidgetInstanceEntry * findInstanceEntry(const char * clName,KviPointerList<OptionsWidgetInstanceEntry> * l);
+	OptionsWidgetInstanceEntry * findInstanceEntry(const QObject * ptr,KviPointerList<OptionsWidgetInstanceEntry> * l);
+	void deleteInstanceTree(KviPointerList<OptionsWidgetInstanceEntry> * l);
 protected slots:
 	void widgetDestroyed();
 };
diff --git a/src/modules/options/container.cpp b/src/modules/options/OptionsWidgetContainer.cpp
index d12e157e5..edb61873c 100644
--- a/src/modules/options/container.cpp
+++ b/src/modules/options/OptionsWidgetContainer.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : container.cpp
+//   File : OptionsWidgetContainer.cpp
 //   Creation date : Wed Nov 21 17:09:49 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,8 +22,8 @@
 //
 //=============================================================================
 
-#include "container.h"
-#include "instances.h"
+#include "OptionsWidgetContainer.h"
+#include "OptionsInstanceManager.h"
 
 #include "KviLocale.h"
 #include "KviIconManager.h"
@@ -39,9 +39,9 @@
 #include <QIcon>
 
 
-extern KviOptionsInstanceManager * g_pOptionsInstanceManager;
+extern OptionsInstanceManager * g_pOptionsInstanceManager;
 
-KviOptionsWidgetContainer::KviOptionsWidgetContainer(QWidget * par,bool bModal)
+OptionsWidgetContainer::OptionsWidgetContainer(QWidget * par,bool bModal)
 : QWidget(par)
 {
 	m_pLayout = new QGridLayout(this);
@@ -54,25 +54,25 @@ KviOptionsWidgetContainer::KviOptionsWidgetContainer(QWidget * par,bool bModal)
 		setWindowModality(Qt::ApplicationModal);
 }
 
-KviOptionsWidgetContainer::~KviOptionsWidgetContainer()
+OptionsWidgetContainer::~OptionsWidgetContainer()
 {
 	if(m_pOptionsWidget)
 		delete m_pOptionsWidget;
 }
 
-void KviOptionsWidgetContainer::setLeftCornerWidget(QWidget * pWidget)
+void OptionsWidgetContainer::setLeftCornerWidget(QWidget * pWidget)
 {
 	if(!pWidget)
 		return;
 	m_pLayout->addWidget(pWidget,1,0);
 }
 
-void KviOptionsWidgetContainer::optionsWidgetDestroyed()
+void OptionsWidgetContainer::optionsWidgetDestroyed()
 {
 	m_pOptionsWidget = NULL;
 }
 
-void KviOptionsWidgetContainer::childEvent(QChildEvent * e)
+void OptionsWidgetContainer::childEvent(QChildEvent * e)
 {
 	// This handles reparents which may happen when
 	// options.edit and options.dialog are used without closing
@@ -89,7 +89,7 @@ void KviOptionsWidgetContainer::childEvent(QChildEvent * e)
 	QWidget::childEvent(e);
 }
 
-void KviOptionsWidgetContainer::setup(KviOptionsWidget * w)
+void OptionsWidgetContainer::setup(KviOptionsWidget * w)
 {
 	if(m_pOptionsWidget)
 		QObject::disconnect(m_pOptionsWidget,SIGNAL(destroyed()),this,SLOT(optionsWidgetDestroyed()));
@@ -115,7 +115,7 @@ void KviOptionsWidgetContainer::setup(KviOptionsWidget * w)
 	m_pLayout->setRowStretch(0,1);
 	m_pLayout->setColumnStretch(0,1);
 
-	KviOptionsWidgetInstanceEntry * e = g_pOptionsInstanceManager->findInstanceEntry(w->metaObject()->className());
+	OptionsWidgetInstanceEntry * e = g_pOptionsInstanceManager->findInstanceEntry(w->metaObject()->className());
 	if(e)
 	{
 		setWindowIcon(QIcon(*(g_pIconManager->getSmallIcon(e->iIcon))));
@@ -128,13 +128,13 @@ void KviOptionsWidgetContainer::setup(KviOptionsWidget * w)
 		QObject::connect(m_pOptionsWidget,SIGNAL(destroyed()),this,SLOT(optionsWidgetDestroyed()));
 }
 
-void KviOptionsWidgetContainer::closeEvent(QCloseEvent *e)
+void OptionsWidgetContainer::closeEvent(QCloseEvent *e)
 {
 	e->ignore();
 	cancelClicked();
 }
 
-void KviOptionsWidgetContainer::showEvent(QShowEvent *e)
+void OptionsWidgetContainer::showEvent(QShowEvent *e)
 {
 	if(parent() == 0)
 	{
@@ -145,12 +145,12 @@ void KviOptionsWidgetContainer::showEvent(QShowEvent *e)
 	m_pCancel->setFocus();
 }
 
-void KviOptionsWidgetContainer::reject()
+void OptionsWidgetContainer::reject()
 {
 	cancelClicked();
 }
 
-void KviOptionsWidgetContainer::okClicked()
+void OptionsWidgetContainer::okClicked()
 {
 	if(m_pOptionsWidget)
 		m_pOptionsWidget->commit();
@@ -158,11 +158,11 @@ void KviOptionsWidgetContainer::okClicked()
 	delete this;
 }
 
-void KviOptionsWidgetContainer::cancelClicked()
+void OptionsWidgetContainer::cancelClicked()
 {
 	deleteLater();
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_container.moc"
+#include "m_OptionsWidgetContainer.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/container.h b/src/modules/options/OptionsWidgetContainer.h
index cc761736b..ae5b2dcc3 100644
--- a/src/modules/options/container.h
+++ b/src/modules/options/OptionsWidgetContainer.h
@@ -2,7 +2,7 @@
 #define _CONTAINER_H_
 //=============================================================================
 //
-//   File : container.h
+//   File : OptionsWidgetContainer.h
 //   Creation date : Wed Nov 21 17:09:50 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -31,12 +31,12 @@
 class QPushButton;
 class QGridLayout;
 
-class KviOptionsWidgetContainer : public QWidget
+class OptionsWidgetContainer : public QWidget
 {
 	Q_OBJECT
 public:
-	KviOptionsWidgetContainer(QWidget * par,bool bModal = false);
-	~KviOptionsWidgetContainer();
+	OptionsWidgetContainer(QWidget * par,bool bModal = false);
+	~OptionsWidgetContainer();
 protected:
 	KviOptionsWidget * m_pOptionsWidget;
 	QPushButton      * m_pCancel;
diff --git a/src/modules/options/optw_highlighting.cpp b/src/modules/options/OptionsWidget_alertsAndHighlighting.cpp
index 4dfde1e0c..2ea8ec8dc 100644
--- a/src/modules/options/optw_highlighting.cpp
+++ b/src/modules/options/OptionsWidget_alertsAndHighlighting.cpp
@@ -2,7 +2,7 @@
 #define _OPTW_HIGHLIGHTING_CPP_
 //=============================================================================
 //
-//   File : optw_highlighting.cpp
+//   File : OptionsWidget_alertsAndHighlighting.cpp
 //   Creation date : Sat Nov  3 18:09:35 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -24,7 +24,7 @@
 //
 //=============================================================================
 
-#include "optw_highlighting.h"
+#include "OptionsWidget_alertsAndHighlighting.h"
 #include "KviOptions.h"
 #include "KviLocale.h"
 
@@ -34,18 +34,18 @@
 
 #include "KviTalToolTip.h"
 
-KviAlertHighlightingOptionsWidget::KviAlertHighlightingOptionsWidget(QWidget * parent)
+OptionsWidget_alertsAndHighlighting::OptionsWidget_alertsAndHighlighting(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("highlighting_options_widget");
 }
 
-KviAlertHighlightingOptionsWidget::~KviAlertHighlightingOptionsWidget()
+OptionsWidget_alertsAndHighlighting::~OptionsWidget_alertsAndHighlighting()
 {
 }
 
 
-KviHighlightingOptionsWidget::KviHighlightingOptionsWidget(QWidget * parent)
+OptionsWidget_highlighting::OptionsWidget_highlighting(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("highlighting_options_widget");
@@ -94,11 +94,11 @@ KviHighlightingOptionsWidget::KviHighlightingOptionsWidget(QWidget * parent)
 	addRowSpacer(0,5,0,5);
 }
 
-KviHighlightingOptionsWidget::~KviHighlightingOptionsWidget()
+OptionsWidget_highlighting::~OptionsWidget_highlighting()
 {
 }
 
-void KviHighlightingOptionsWidget::commit()
+void OptionsWidget_highlighting::commit()
 {
 	KVI_OPTION_STRING(KviOption_stringWordSplitters) = m_pWordSplitterCharactersEdit->text().trimmed();
 	KVI_OPTION_BOOL(KviOption_boolUseFullWordHighlighting) = m_pHighlightAllOccurencesRadioButton->isChecked();
@@ -108,7 +108,7 @@ void KviHighlightingOptionsWidget::commit()
 
 
 
-KviAlertOptionsWidget::KviAlertOptionsWidget(QWidget * parent)
+OptionsWidget_alerts::OptionsWidget_alerts(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("highlighting_options_widget");
@@ -138,13 +138,13 @@ KviAlertOptionsWidget::KviAlertOptionsWidget(QWidget * parent)
 	addRowSpacer(0,1,0,1);
 }
 
-KviAlertOptionsWidget::~KviAlertOptionsWidget()
+OptionsWidget_alerts::~OptionsWidget_alerts()
 {
 }
 
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_highlighting.moc"
+#include "m_OptionsWidget_alertsAndHighlighting.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
 
 #endif //_OPTW_HIGHLIGHTING_CPP_
diff --git a/src/modules/options/optw_highlighting.h b/src/modules/options/OptionsWidget_alertsAndHighlighting.h
index 6b29678d4..6a9bb506b 100644
--- a/src/modules/options/optw_highlighting.h
+++ b/src/modules/options/OptionsWidget_alertsAndHighlighting.h
@@ -2,7 +2,7 @@
 #define _OPTW_HIGHLIGHTING_H_
 //=============================================================================
 //
-//   File : optw_highlighting.h
+//   File : OptionsWidget_alertsAndHighlighting.h
 //   Creation date : Sat Nov  3 18:09:37 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -31,28 +31,28 @@ class QLineEdit;
 
 #define KVI_OPTIONS_WIDGET_ICON_KviAlertHighlightingOptionsWidget KVI_SMALLICON_RAW
 #define KVI_OPTIONS_WIDGET_NAME_KviAlertHighlightingOptionsWidget __tr2qs_no_lookup("Alert/Highlight")
-#define KVI_OPTIONS_WIDGET_PARENT_KviAlertHighlightingOptionsWidget KviToolsOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviAlertHighlightingOptionsWidget OptionsWidget_tools
 #define KVI_OPTIONS_WIDGET_CONTAINER_KviAlertHighlightingOptionsWidget true
 
-class KviAlertHighlightingOptionsWidget : public KviOptionsWidget
+class OptionsWidget_alertsAndHighlighting : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviAlertHighlightingOptionsWidget(QWidget * parent);
-	~KviAlertHighlightingOptionsWidget();
+	OptionsWidget_alertsAndHighlighting(QWidget * parent);
+	~OptionsWidget_alertsAndHighlighting();
 };
 
 
 #define KVI_OPTIONS_WIDGET_ICON_KviHighlightingOptionsWidget KVI_SMALLICON_RAW
 #define KVI_OPTIONS_WIDGET_NAME_KviHighlightingOptionsWidget __tr2qs_no_lookup("Highlight")
-#define KVI_OPTIONS_WIDGET_PARENT_KviHighlightingOptionsWidget KviAlertHighlightingOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviHighlightingOptionsWidget OptionsWidget_alertsAndHighlighting
 
-class KviHighlightingOptionsWidget : public KviOptionsWidget
+class OptionsWidget_highlighting : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviHighlightingOptionsWidget(QWidget * parent);
-	~KviHighlightingOptionsWidget();
+	OptionsWidget_highlighting(QWidget * parent);
+	~OptionsWidget_highlighting();
 private:
 	QRadioButton * m_pHighlightAllOccurencesRadioButton;
 	QRadioButton * m_pHighlightWholeWordsOnlyRadioButton;
@@ -66,14 +66,14 @@ protected:
 
 #define KVI_OPTIONS_WIDGET_ICON_KviAlertOptionsWidget KVI_SMALLICON_RAW
 #define KVI_OPTIONS_WIDGET_NAME_KviAlertOptionsWidget __tr2qs_no_lookup("Window List Alert")
-#define KVI_OPTIONS_WIDGET_PARENT_KviAlertOptionsWidget KviAlertHighlightingOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviAlertOptionsWidget OptionsWidget_alertsAndHighlighting
 
-class KviAlertOptionsWidget : public KviOptionsWidget
+class OptionsWidget_alerts : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviAlertOptionsWidget(QWidget * parent);
-	~KviAlertOptionsWidget();
+	OptionsWidget_alerts(QWidget * parent);
+	~OptionsWidget_alerts();
 };
 
 
diff --git a/src/modules/options/optw_antispam.cpp b/src/modules/options/OptionsWidget_antiSpam.cpp
index 3127c7b79..6b7648884 100644
--- a/src/modules/options/optw_antispam.cpp
+++ b/src/modules/options/OptionsWidget_antiSpam.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_antispam.cpp
+//   File : OptionsWidget_antiSpam.cpp
 //   Creation date : Tue Oct 16 15:47:02 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "optw_antispam.h"
+#include "OptionsWidget_antiSpam.h"
 
 #include "KviOptions.h"
 #include "KviLocale.h"
@@ -30,7 +30,7 @@
 #include <QLayout>
 #include <QLabel>
 
-KviAntispamOptionsWidget::KviAntispamOptionsWidget(QWidget * parent)
+OptionsWidget_antispam::OptionsWidget_antispam(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("antispam_options_widget");
@@ -50,11 +50,11 @@ KviAntispamOptionsWidget::KviAntispamOptionsWidget(QWidget * parent)
 	layout()->setRowStretch(2,1);
 }
 
-KviAntispamOptionsWidget::~KviAntispamOptionsWidget()
+OptionsWidget_antispam::~OptionsWidget_antispam()
 {
 }
 
-void KviAntispamOptionsWidget::reenableStuff(bool)
+void OptionsWidget_antispam::reenableStuff(bool)
 {
 	m_b3->setEnabled(m_b1->isChecked() || m_b2->isChecked());
 	m_sl->setEnabled(m_b1->isChecked() || m_b2->isChecked());
@@ -62,5 +62,5 @@ void KviAntispamOptionsWidget::reenableStuff(bool)
 
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_antispam.moc"
+#include "m_OptionsWidget_antiSpam.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_antispam.h b/src/modules/options/OptionsWidget_antiSpam.h
index 2e0ef7808..245ce9105 100644
--- a/src/modules/options/optw_antispam.h
+++ b/src/modules/options/OptionsWidget_antiSpam.h
@@ -2,7 +2,7 @@
 #define _OPTW_ANTISPAM_H_
 //=============================================================================
 //
-//   File : optw_antispam.h
+//   File : OptionsWidget_antiSpam.h
 //   Creation date : Tue Oct 16 15:47:03 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -28,14 +28,14 @@
 
 #define KVI_OPTIONS_WIDGET_ICON_KviAntispamOptionsWidget KVI_SMALLICON_SPAM
 #define KVI_OPTIONS_WIDGET_NAME_KviAntispamOptionsWidget __tr2qs_no_lookup("Anti-spam")
-#define KVI_OPTIONS_WIDGET_PARENT_KviAntispamOptionsWidget KviProtectionOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviAntispamOptionsWidget OptionsWidget_protection
 
-class KviAntispamOptionsWidget : public KviOptionsWidget
+class OptionsWidget_antispam : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviAntispamOptionsWidget(QWidget * parent);
-	~KviAntispamOptionsWidget();
+	OptionsWidget_antispam(QWidget * parent);
+	~OptionsWidget_antispam();
 protected:
 	KviBoolSelector * m_b1;
 	KviBoolSelector * m_b2;
diff --git a/src/modules/options/optw_avatar.cpp b/src/modules/options/OptionsWidget_avatar.cpp
index 9e3fd0ced..6f48d5f88 100644
--- a/src/modules/options/optw_avatar.cpp
+++ b/src/modules/options/OptionsWidget_avatar.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_avatar.cpp
+//   File : OptionsWidget_avatar.cpp
 //   Creation date : Wed Nov 19 09:25:16 2005 GMT by Grifisx & Noldor
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,14 +22,14 @@
 //
 //=============================================================================
 
-#include "optw_avatar.h"
+#include "OptionsWidget_avatar.h"
 
 #include "KviLocale.h"
 #include "KviSelectors.h"
 #include "KviOptions.h"
 #include "KviTalToolTip.h"
 
-KviAvatarAdvancedOptionsWidget::KviAvatarAdvancedOptionsWidget(QWidget * parent)
+OptionsWidget_avatar::OptionsWidget_avatar(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("avatar_advanced_options_widget");
@@ -111,11 +111,11 @@ KviAvatarAdvancedOptionsWidget::KviAvatarAdvancedOptionsWidget(QWidget * parent)
 	addRowSpacer(0,3,0,3);
 }
 
-KviAvatarAdvancedOptionsWidget::~KviAvatarAdvancedOptionsWidget()
+OptionsWidget_avatar::~OptionsWidget_avatar()
 {
 }
 
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_avatar.moc"
+#include "m_OptionsWidget_avatar.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_avatar.h b/src/modules/options/OptionsWidget_avatar.h
index bfc9a8d5f..890303b2d 100644
--- a/src/modules/options/optw_avatar.h
+++ b/src/modules/options/OptionsWidget_avatar.h
@@ -3,7 +3,7 @@
 
 //=============================================================================
 //
-//   File : optw_avatar.cpp
+//   File : OptionsWidget_avatar.cpp
 //   Creation date : Wed Nov 19 09:25:16 2005 GMT by Grifisx & Noldor
 //
 //   This file is part of the KVIrc irc client distribution
@@ -30,16 +30,16 @@
 
 #define KVI_OPTIONS_WIDGET_ICON_KviAvatarAdvancedOptionsWidget KVI_SMALLICON_AVATAR
 #define KVI_OPTIONS_WIDGET_NAME_KviAvatarAdvancedOptionsWidget __tr2qs_no_lookup("Avatars")
-#define KVI_OPTIONS_WIDGET_PARENT_KviAvatarAdvancedOptionsWidget KviToolsOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviAvatarAdvancedOptionsWidget OptionsWidget_tools
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviAvatarAdvancedOptionsWidget 9
 #define KVI_OPTIONS_WIDGET_MINIMAL_USER_EXPERIENCE_LEVEL_KviAvatarAdvancedOptionsWidget 2
 
-class KviAvatarAdvancedOptionsWidget : public KviOptionsWidget
+class OptionsWidget_avatar : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviAvatarAdvancedOptionsWidget(QWidget * parent);
-	~KviAvatarAdvancedOptionsWidget();
+	OptionsWidget_avatar(QWidget * parent);
+	~OptionsWidget_avatar();
 };
 
 #endif //!_OPTW_AVATAR_H_
diff --git a/src/modules/options/optw_away.cpp b/src/modules/options/OptionsWidget_away.cpp
index a4df53821..f4f2041de 100644
--- a/src/modules/options/optw_away.cpp
+++ b/src/modules/options/OptionsWidget_away.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_away.cpp
+//   File : OptionsWidget_away.cpp
 //   Creation date : Mon Oct 29 15:37:16 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,14 +22,14 @@
 //
 //=============================================================================
 
-#include "optw_away.h"
+#include "OptionsWidget_away.h"
 
 #include "KviOptions.h"
 #include "KviLocale.h"
 
 #include <QLayout>
 
-KviAwayOptionsWidget::KviAwayOptionsWidget(QWidget * parent)
+OptionsWidget_away::OptionsWidget_away(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("away_options_widget");
@@ -55,20 +55,20 @@ KviAwayOptionsWidget::KviAwayOptionsWidget(QWidget * parent)
 	addRowSpacer(0,4,0,4);
 }
 
-KviAwayOptionsWidget::~KviAwayOptionsWidget()
+OptionsWidget_away::~OptionsWidget_away()
 {
 }
 
-void KviAwayOptionsWidget::enableCustomAwayText(bool)
+void OptionsWidget_away::enableCustomAwayText(bool)
 {
 	m_pCustomAwayNick->setEnabled(m_pEnableAwayNick->isChecked() && !(m_pEnableCustomAwayNick->isChecked()));
 }
 
-void KviAwayOptionsWidget::enableAwayMessage(bool)
+void OptionsWidget_away::enableAwayMessage(bool)
 {
 	m_pAwayMessage->setEnabled(m_pEnableAwayMessage->isChecked());
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_away.moc"
+#include "m_OptionsWidget_away.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_away.h b/src/modules/options/OptionsWidget_away.h
index 45ebbdcd9..c082d06de 100644
--- a/src/modules/options/optw_away.h
+++ b/src/modules/options/OptionsWidget_away.h
@@ -2,7 +2,7 @@
 #define _OPTW_AWAY_H_
 //=============================================================================
 //
-//   File : optw_away.h
+//   File : OptionsWidget_away.h
 //   Creation date : Mon Oct 29 15:37:18 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -28,14 +28,14 @@
 
 #define KVI_OPTIONS_WIDGET_ICON_KviAwayOptionsWidget KVI_SMALLICON_AWAY
 #define KVI_OPTIONS_WIDGET_NAME_KviAwayOptionsWidget __tr2qs_no_lookup("Away")
-#define KVI_OPTIONS_WIDGET_PARENT_KviAwayOptionsWidget KviToolsOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviAwayOptionsWidget OptionsWidget_tools
 
-class KviAwayOptionsWidget : public KviOptionsWidget
+class OptionsWidget_away : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviAwayOptionsWidget(QWidget * parent);
-	~KviAwayOptionsWidget();
+	OptionsWidget_away(QWidget * parent);
+	~OptionsWidget_away();
 protected:
 	KviBoolSelector     * m_pEnableAwayMessage;
 	KviStringSelector   * m_pAwayMessage;
diff --git a/src/modules/options/optw_channel.cpp b/src/modules/options/OptionsWidget_channel.cpp
index ed14f947e..21db51a8a 100644
--- a/src/modules/options/optw_channel.cpp
+++ b/src/modules/options/OptionsWidget_channel.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_channel.cpp
+//   File : OptionsWidget_channel.cpp
 //   Creation date : Sat Sep 27 19:30:02 2008 GMT by Elvio Basello
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,12 +22,12 @@
 //
 //=============================================================================
 //
-// This file was originally part of optw_irc.cpp
+// This file was originally part of OptionsWidget_irc.cpp
 //
 //=============================================================================
 
 
-#include "optw_channel.h"
+#include "OptionsWidget_channel.h"
 
 #include "KviOptions.h"
 #include "KviLocale.h"
@@ -36,16 +36,16 @@
 
 #include <QComboBox>
 
-KviChannelOptionsWidget::KviChannelOptionsWidget(QWidget * pParent)
+OptionsWidget_channel::OptionsWidget_channel(QWidget * pParent)
 : KviOptionsWidget(pParent)
 {
 }
 
-KviChannelOptionsWidget::~KviChannelOptionsWidget()
+OptionsWidget_channel::~OptionsWidget_channel()
 {
 }
 
-KviChannelGeneralOptionsWidget::KviChannelGeneralOptionsWidget(QWidget * pParent)
+OptionsWidget_channelGeneral::OptionsWidget_channelGeneral(QWidget * pParent)
 : KviOptionsWidget(pParent)
 {
 	createLayout();
@@ -86,12 +86,12 @@ KviChannelGeneralOptionsWidget::KviChannelGeneralOptionsWidget(QWidget * pParent
 	addRowSpacer(0,4,0,4);
 }
 
-KviChannelGeneralOptionsWidget::~KviChannelGeneralOptionsWidget()
+OptionsWidget_channelGeneral::~OptionsWidget_channelGeneral()
 {
 }
 
 
-KviChannelAdvancedOptionsWidget::KviChannelAdvancedOptionsWidget(QWidget * pParent)
+OptionsWidget_channelAdvanced::OptionsWidget_channelAdvanced(QWidget * pParent)
 : KviOptionsWidget(pParent)
 {
 	createLayout();
@@ -150,11 +150,11 @@ KviChannelAdvancedOptionsWidget::KviChannelAdvancedOptionsWidget(QWidget * pPare
 	addRowSpacer(0,5,4,5);
 }
 
-KviChannelAdvancedOptionsWidget::~KviChannelAdvancedOptionsWidget()
+OptionsWidget_channelAdvanced::~OptionsWidget_channelAdvanced()
 {
 }
 
-void KviChannelAdvancedOptionsWidget::commit()
+void OptionsWidget_channelAdvanced::commit()
 {
 	KVI_OPTION_UINT(KviOption_uintDefaultBanType)=m_pBanTypeCombo->currentIndex();
 	if((KVI_OPTION_UINT(KviOption_uintDefaultBanType)>26)) KVI_OPTION_UINT(KviOption_uintDefaultBanType)=7;
@@ -162,5 +162,5 @@ void KviChannelAdvancedOptionsWidget::commit()
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_channel.moc"
+#include "m_OptionsWidget_channel.moc"
 #endif //COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_channel.h b/src/modules/options/OptionsWidget_channel.h
index 26528526c..85107680f 100644
--- a/src/modules/options/optw_channel.h
+++ b/src/modules/options/OptionsWidget_channel.h
@@ -2,7 +2,7 @@
 #define _OPTW_CHANNEL_H_
 //=============================================================================
 //
-//   File : optw_channel.h
+//   File : OptionsWidget_channel.h
 //   Creation date : Sat Sep 27 19:30:02 2008 GMT by Elvio Basello
 //
 //   This file is part of the KVIrc irc client distribution
@@ -24,7 +24,7 @@
 //
 //=============================================================================
 //
-// This file was originally part of optw_irc.h
+// This file was originally part of OptionsWidget_irc.h
 //
 //=============================================================================
 
@@ -34,42 +34,42 @@ class QComboBox;
 
 #define KVI_OPTIONS_WIDGET_ICON_KviChannelOptionsWidget KVI_SMALLICON_CHANNEL
 #define KVI_OPTIONS_WIDGET_NAME_KviChannelOptionsWidget __tr2qs_no_lookup("Channel")
-#define KVI_OPTIONS_WIDGET_PARENT_KviChannelOptionsWidget KviIrcOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviChannelOptionsWidget OptionsWidget_irc
 #define KVI_OPTIONS_WIDGET_CONTAINER_KviChannelOptionsWidget true
 #define KVI_OPTIONS_WIDGET_NOTCONTAINED_KviChannelOptionsWidget true
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviChannelOptionsWidget 90000
 
-class KviChannelOptionsWidget : public KviOptionsWidget
+class OptionsWidget_channel : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviChannelOptionsWidget(QWidget * parent);
-	~KviChannelOptionsWidget();
+	OptionsWidget_channel(QWidget * parent);
+	~OptionsWidget_channel();
 };
 
 
 #define KVI_OPTIONS_WIDGET_ICON_KviChannelGeneralOptionsWidget KVI_SMALLICON_CHANNEL
 #define KVI_OPTIONS_WIDGET_NAME_KviChannelGeneralOptionsWidget __tr2qs_no_lookup("General")
-#define KVI_OPTIONS_WIDGET_PARENT_KviChannelGeneralOptionsWidget KviChannelOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviChannelGeneralOptionsWidget OptionsWidget_channel
 
-class KviChannelGeneralOptionsWidget : public KviOptionsWidget
+class OptionsWidget_channelGeneral : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviChannelGeneralOptionsWidget(QWidget * parent);
-	~KviChannelGeneralOptionsWidget();
+	OptionsWidget_channelGeneral(QWidget * parent);
+	~OptionsWidget_channelGeneral();
 };
 
 #define KVI_OPTIONS_WIDGET_ICON_KviChannelAdvancedOptionsWidget KVI_SMALLICON_CHANNEL
 #define KVI_OPTIONS_WIDGET_NAME_KviChannelAdvancedOptionsWidget __tr2qs_no_lookup("Advanced")
-#define KVI_OPTIONS_WIDGET_PARENT_KviChannelAdvancedOptionsWidget KviChannelOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviChannelAdvancedOptionsWidget OptionsWidget_channel
 
-class KviChannelAdvancedOptionsWidget : public KviOptionsWidget
+class OptionsWidget_channelAdvanced : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviChannelAdvancedOptionsWidget(QWidget * parent);
-	~KviChannelAdvancedOptionsWidget();
+	OptionsWidget_channelAdvanced(QWidget * parent);
+	~OptionsWidget_channelAdvanced();
 public:
 	virtual void commit();
 protected:
diff --git a/src/modules/options/optw_connection.cpp b/src/modules/options/OptionsWidget_connection.cpp
index 226e4a4db..0e5f3d2cf 100644
--- a/src/modules/options/optw_connection.cpp
+++ b/src/modules/options/OptionsWidget_connection.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_connection.cpp
+//   File : OptionsWidget_connection.cpp
 //   Creation date : Sat Nov 24 04:25:16 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -23,7 +23,7 @@
 //
 //=============================================================================
 
-#include "optw_connection.h"
+#include "OptionsWidget_connection.h"
 
 #include "kvi_settings.h"
 #include "KviLocale.h"
@@ -33,7 +33,7 @@
 #include <QRadioButton>
 
 
-KviConnectionOptionsWidget::KviConnectionOptionsWidget(QWidget * parent)
+OptionsWidget_connection::OptionsWidget_connection(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("connection_options_widget");
@@ -93,12 +93,12 @@ KviConnectionOptionsWidget::KviConnectionOptionsWidget(QWidget * parent)
 	addRowSpacer(0,3,4,3);
 }
 
-KviConnectionOptionsWidget::~KviConnectionOptionsWidget()
+OptionsWidget_connection::~OptionsWidget_connection()
 {
 }
 
 
-KviSSLOptionsWidget::KviSSLOptionsWidget(QWidget * parent)
+OptionsWidget_connectionSsl::OptionsWidget_connectionSsl(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("ssl_options_widget");
@@ -136,12 +136,12 @@ KviSSLOptionsWidget::KviSSLOptionsWidget(QWidget * parent)
 #endif
 }
 
-KviSSLOptionsWidget::~KviSSLOptionsWidget()
+OptionsWidget_connectionSsl::~OptionsWidget_connectionSsl()
 {
 }
 
 
-KviTransportOptionsWidget::KviTransportOptionsWidget(QWidget * parent)
+OptionsWidget_connectionSocket::OptionsWidget_connectionSocket(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("transport_options_widget");
@@ -182,12 +182,12 @@ KviTransportOptionsWidget::KviTransportOptionsWidget(QWidget * parent)
 	addRowSpacer(0,5,0,5);
 }
 
-KviTransportOptionsWidget::~KviTransportOptionsWidget()
+OptionsWidget_connectionSocket::~OptionsWidget_connectionSocket()
 {
 }
 
 
-KviIdentOptionsWidget::KviIdentOptionsWidget(QWidget * parent)
+OptionsWidget_identService::OptionsWidget_identService(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("ident_options_widget");
@@ -266,11 +266,11 @@ KviIdentOptionsWidget::KviIdentOptionsWidget(QWidget * parent)
 	addRowSpacer(0,5,0,5);
 }
 
-KviIdentOptionsWidget::~KviIdentOptionsWidget()
+OptionsWidget_identService::~OptionsWidget_identService()
 {
 }
 
-void KviIdentOptionsWidget::commit()
+void OptionsWidget_identService::commit()
 {
 	KviOptionsWidget::commit();
 	if(m_pConsoleRadio->isChecked())
@@ -281,7 +281,7 @@ void KviIdentOptionsWidget::commit()
 		KVI_OPTION_UINT(KviOption_uintIdentdOutputMode)=KviIdentdOutputMode::Quiet;
 }
 
-void KviIdentOptionsWidget::enableIpv4InIpv6(bool)
+void OptionsWidget_identService::enableIpv4InIpv6(bool)
 {
 #ifdef COMPILE_IPV6_SUPPORT
 	m_pIpv4InIpv6->setEnabled(m_pEnableIdent->isChecked() && m_pEnableIpv6->isChecked());
@@ -289,16 +289,16 @@ void KviIdentOptionsWidget::enableIpv4InIpv6(bool)
 }
 
 
-KviConnectionAdvancedOptionsWidget::KviConnectionAdvancedOptionsWidget(QWidget * parent)
+OptionsWidget_connectionAdvanced::OptionsWidget_connectionAdvanced(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("connection_advanced_options_widget");
 }
 
-KviConnectionAdvancedOptionsWidget::~KviConnectionAdvancedOptionsWidget()
+OptionsWidget_connectionAdvanced::~OptionsWidget_connectionAdvanced()
 {
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_connection.moc"
+#include "m_OptionsWidget_connection.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_connection.h b/src/modules/options/OptionsWidget_connection.h
index 8ab8895c8..499cc300a 100644
--- a/src/modules/options/optw_connection.h
+++ b/src/modules/options/OptionsWidget_connection.h
@@ -2,7 +2,7 @@
 #define _OPTW_CONNECTION_H_
 //=============================================================================
 //
-//   File : optw_connection.h
+//   File : OptionsWidget_connection.h
 //   Creation date : Sat Nov 24 04:25:12 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -32,73 +32,73 @@ class QRadioButton;
 #define KVI_OPTIONS_WIDGET_NAME_KviConnectionOptionsWidget __tr2qs_no_lookup("Connection")
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviConnectionOptionsWidget 98000
 
-class KviConnectionOptionsWidget : public KviOptionsWidget
+class OptionsWidget_connection : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviConnectionOptionsWidget(QWidget * parent);
-	~KviConnectionOptionsWidget();
+	OptionsWidget_connection(QWidget * parent);
+	~OptionsWidget_connection();
 };
 
 
 #define KVI_OPTIONS_WIDGET_ICON_KviConnectionAdvancedOptionsWidget KVI_SMALLICON_WORLD
 #define KVI_OPTIONS_WIDGET_NAME_KviConnectionAdvancedOptionsWidget __tr2qs_no_lookup("Advanced")
-#define KVI_OPTIONS_WIDGET_PARENT_KviConnectionAdvancedOptionsWidget KviConnectionOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviConnectionAdvancedOptionsWidget OptionsWidget_connection
 #define KVI_OPTIONS_WIDGET_CONTAINER_KviConnectionAdvancedOptionsWidget true
 
-class KviConnectionAdvancedOptionsWidget : public KviOptionsWidget
+class OptionsWidget_connectionAdvanced : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviConnectionAdvancedOptionsWidget(QWidget * parent);
-	~KviConnectionAdvancedOptionsWidget();
+	OptionsWidget_connectionAdvanced(QWidget * parent);
+	~OptionsWidget_connectionAdvanced();
 };
 
 
 #define KVI_OPTIONS_WIDGET_ICON_KviSSLOptionsWidget KVI_SMALLICON_SSL
 #define KVI_OPTIONS_WIDGET_NAME_KviSSLOptionsWidget __tr2qs_no_lookup("SSL")
-#define KVI_OPTIONS_WIDGET_PARENT_KviSSLOptionsWidget KviConnectionAdvancedOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviSSLOptionsWidget OptionsWidget_connectionAdvanced
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviSSLOptionsWidget 30
 
 
 
-class KviSSLOptionsWidget : public KviOptionsWidget
+class OptionsWidget_connectionSsl : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviSSLOptionsWidget(QWidget * parent);
-	~KviSSLOptionsWidget();
+	OptionsWidget_connectionSsl(QWidget * parent);
+	~OptionsWidget_connectionSsl();
 };
 
 
 
 #define KVI_OPTIONS_WIDGET_ICON_KviTransportOptionsWidget KVI_SMALLICON_SOCKETERROR
 #define KVI_OPTIONS_WIDGET_NAME_KviTransportOptionsWidget __tr2qs_no_lookup("Socket")
-#define KVI_OPTIONS_WIDGET_PARENT_KviTransportOptionsWidget KviConnectionAdvancedOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviTransportOptionsWidget OptionsWidget_connectionAdvanced
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviTransportOptionsWidget 20
 
 
-class KviTransportOptionsWidget : public KviOptionsWidget
+class OptionsWidget_connectionSocket : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviTransportOptionsWidget(QWidget * parent);
-	~KviTransportOptionsWidget();
+	OptionsWidget_connectionSocket(QWidget * parent);
+	~OptionsWidget_connectionSocket();
 };
 
 
 #define KVI_OPTIONS_WIDGET_ICON_KviIdentOptionsWidget KVI_SMALLICON_IDENT
 #define KVI_OPTIONS_WIDGET_NAME_KviIdentOptionsWidget __tr2qs_no_lookup("Ident Service")
-#define KVI_OPTIONS_WIDGET_PARENT_KviIdentOptionsWidget KviConnectionAdvancedOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviIdentOptionsWidget OptionsWidget_connectionAdvanced
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviIdentOptionsWidget 10
 
 
-class KviIdentOptionsWidget : public KviOptionsWidget
+class OptionsWidget_identService : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviIdentOptionsWidget(QWidget * parent);
-	~KviIdentOptionsWidget();
+	OptionsWidget_identService(QWidget * parent);
+	~OptionsWidget_identService();
 
 	virtual void commit();
 protected:
diff --git a/src/modules/options/optw_ctcp.cpp b/src/modules/options/OptionsWidget_ctcp.cpp
index 7c84afa92..47b381c70 100644
--- a/src/modules/options/optw_ctcp.cpp
+++ b/src/modules/options/OptionsWidget_ctcp.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_ctcp.cpp
+//   File : OptionsWidget_ctcp.cpp
 //   Creation date : Sun Dec  2 20:40:43 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,14 +22,14 @@
 //
 //=============================================================================
 
-#include "optw_ctcp.h"
+#include "OptionsWidget_ctcp.h"
 
 #include "kvi_settings.h"
 #include "KviLocale.h"
 #include "KviOptions.h"
 
 
-KviCtcpOptionsWidget::KviCtcpOptionsWidget(QWidget * parent)
+OptionsWidget_ctcp::OptionsWidget_ctcp(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("ctcp_options_widget");
@@ -73,11 +73,11 @@ KviCtcpOptionsWidget::KviCtcpOptionsWidget(QWidget * parent)
 }
 
 
-KviCtcpOptionsWidget::~KviCtcpOptionsWidget()
+OptionsWidget_ctcp::~OptionsWidget_ctcp()
 {
 }
 
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_ctcp.moc"
+#include "m_OptionsWidget_ctcp.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_ctcp.h b/src/modules/options/OptionsWidget_ctcp.h
index 34d5162aa..edb6719f5 100644
--- a/src/modules/options/optw_ctcp.h
+++ b/src/modules/options/OptionsWidget_ctcp.h
@@ -2,7 +2,7 @@
 #define _OPTW_CTCP_H_
 //=============================================================================
 //
-//   File : optw_ctcp.h
+//   File : OptionsWidget_ctcp.h
 //   Creation date : Sun Dec  2 20:40:43 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -28,15 +28,15 @@
 
 #define KVI_OPTIONS_WIDGET_ICON_KviCtcpOptionsWidget KVI_SMALLICON_CTCPREQUESTREPLIED
 #define KVI_OPTIONS_WIDGET_NAME_KviCtcpOptionsWidget __tr2qs_no_lookup("CTCP")
-#define KVI_OPTIONS_WIDGET_PARENT_KviCtcpOptionsWidget KviToolsOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviCtcpOptionsWidget OptionsWidget_tools
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviCtcpOptionsWidget 70000
 
-class KviCtcpOptionsWidget : public KviOptionsWidget
+class OptionsWidget_ctcp : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviCtcpOptionsWidget(QWidget * parent);
-	~KviCtcpOptionsWidget();
+	OptionsWidget_ctcp(QWidget * parent);
+	~OptionsWidget_ctcp();
 };
 
 
diff --git a/src/modules/options/optw_ctcpfloodprotection.cpp b/src/modules/options/OptionsWidget_ctcpFloodProtection.cpp
index 49df21a19..0abfd22ca 100644
--- a/src/modules/options/optw_ctcpfloodprotection.cpp
+++ b/src/modules/options/OptionsWidget_ctcpFloodProtection.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_ctcpfloodprotection.cpp
+//   File : OptionsWidget_ctcpFloodProtection.cpp
 //   Creation date : Sun Jan 21 2001 14:35:06 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "optw_ctcpfloodprotection.h"
+#include "OptionsWidget_ctcpFloodProtection.h"
 
 #include "KviOptions.h"
 #include "KviLocale.h"
@@ -73,7 +73,7 @@
 */
 
 
-KviCtcpFloodProtectionOptionsWidget::KviCtcpFloodProtectionOptionsWidget(QWidget * parent)
+OptionsWidget_ctcpFloodProtection::OptionsWidget_ctcpFloodProtection(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("ctcpfloodprotection_options_widget");
@@ -108,11 +108,11 @@ KviCtcpFloodProtectionOptionsWidget::KviCtcpFloodProtectionOptionsWidget(QWidget
 	addRowSpacer(0,3,1,3);
 }
 
-KviCtcpFloodProtectionOptionsWidget::~KviCtcpFloodProtectionOptionsWidget()
+OptionsWidget_ctcpFloodProtection::~OptionsWidget_ctcpFloodProtection()
 {
 }
 
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_ctcpfloodprotection.moc"
+#include "m_OptionsWidget_ctcpFloodProtection.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_ctcpfloodprotection.h b/src/modules/options/OptionsWidget_ctcpFloodProtection.h
index 89a00868a..aef0559d3 100644
--- a/src/modules/options/optw_ctcpfloodprotection.h
+++ b/src/modules/options/OptionsWidget_ctcpFloodProtection.h
@@ -2,7 +2,7 @@
 #define _OPTW_CTCPFLOODPROTECTION_H_
 //=============================================================================
 //
-//   File : optw_ctcpfloodprotection.h
+//   File : OptionsWidget_ctcpFloodProtection.h
 //   Creation date : Sun Jan 21 2000 14:34:12 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -28,15 +28,15 @@
 
 #define KVI_OPTIONS_WIDGET_ICON_KviCtcpFloodProtectionOptionsWidget KVI_SMALLICON_CTCPREQUESTFLOOD
 #define KVI_OPTIONS_WIDGET_NAME_KviCtcpFloodProtectionOptionsWidget __tr2qs_no_lookup("Flood Protection")
-#define KVI_OPTIONS_WIDGET_PARENT_KviCtcpFloodProtectionOptionsWidget KviProtectionOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviCtcpFloodProtectionOptionsWidget OptionsWidget_protection
 
-class KviCtcpFloodProtectionOptionsWidget : public KviOptionsWidget
+class OptionsWidget_ctcpFloodProtection : public KviOptionsWidget
 {
 	Q_OBJECT
 //	Q_CLASSINFO("help","ctcpfloodprotectionoptions")
 public:
-	KviCtcpFloodProtectionOptionsWidget(QWidget * parent);
-	~KviCtcpFloodProtectionOptionsWidget();
+	OptionsWidget_ctcpFloodProtection(QWidget * parent);
+	~OptionsWidget_ctcpFloodProtection();
 };
 
 #endif //!_OPTW_CTCPFLOODPROTECTION_H_
diff --git a/src/modules/options/optw_dcc.cpp b/src/modules/options/OptionsWidget_dcc.cpp
index 2d44350dd..bfeede363 100644
--- a/src/modules/options/optw_dcc.cpp
+++ b/src/modules/options/OptionsWidget_dcc.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_dcc.cpp
+//   File : OptionsWidget_dcc.cpp
 //   Creation date : Fri Aug 17 22:08:09 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "optw_dcc.h"
+#include "OptionsWidget_dcc.h"
 
 #include "KviOptions.h"
 #include "KviLocale.h"
@@ -30,19 +30,19 @@
 #include <QLayout>
 
 
-KviDccOptionsWidget::KviDccOptionsWidget(QWidget * pParent)
+OptionsWidget_dcc::OptionsWidget_dcc(QWidget * pParent)
 : KviOptionsWidget(pParent)
 {
 }
 
-KviDccOptionsWidget::~KviDccOptionsWidget()
+OptionsWidget_dcc::~OptionsWidget_dcc()
 {
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviDccGeneralOptionsWidget::KviDccGeneralOptionsWidget(QWidget * parent)
+OptionsWidget_dccGeneral::OptionsWidget_dccGeneral(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("dccgeneral_options_widget");
@@ -57,13 +57,13 @@ KviDccGeneralOptionsWidget::KviDccGeneralOptionsWidget(QWidget * parent)
 	addRowSpacer(0,1,0,1);
 }
 
-KviDccGeneralOptionsWidget::~KviDccGeneralOptionsWidget()
+OptionsWidget_dccGeneral::~OptionsWidget_dccGeneral()
 {
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-KviDccAdvancedOptionsWidget::KviDccAdvancedOptionsWidget(QWidget * parent)
+OptionsWidget_dccAdvanced::OptionsWidget_dccAdvanced(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("dccgeneral_options_widget");
@@ -144,7 +144,7 @@ KviDccAdvancedOptionsWidget::KviDccAdvancedOptionsWidget(QWidget * parent)
 	addRowSpacer(0,4,1,4);
 }
 
-KviDccAdvancedOptionsWidget::~KviDccAdvancedOptionsWidget()
+OptionsWidget_dccAdvanced::~OptionsWidget_dccAdvanced()
 {
 }
 
@@ -152,18 +152,18 @@ KviDccAdvancedOptionsWidget::~KviDccAdvancedOptionsWidget()
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviDccSendOptionsWidget::KviDccSendOptionsWidget(QWidget * parent)
+OptionsWidget_dccSend::OptionsWidget_dccSend(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("dccsend_options_widget");
 }
 
-KviDccSendOptionsWidget::~KviDccSendOptionsWidget()
+OptionsWidget_dccSend::~OptionsWidget_dccSend()
 {
 }
 
 
-KviDccSendGeneralOptionsWidget::KviDccSendGeneralOptionsWidget(QWidget * parent)
+OptionsWidget_dccSendGeneral::OptionsWidget_dccSendGeneral(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("dccsend_options_widget");
@@ -199,12 +199,12 @@ KviDccSendGeneralOptionsWidget::KviDccSendGeneralOptionsWidget(QWidget * parent)
 	addRowSpacer(0,4,0,4);
 }
 
-KviDccSendGeneralOptionsWidget::~KviDccSendGeneralOptionsWidget()
+OptionsWidget_dccSendGeneral::~OptionsWidget_dccSendGeneral()
 {
 }
 
 
-KviDccSendAdvancedOptionsWidget::KviDccSendAdvancedOptionsWidget(QWidget * parent)
+OptionsWidget_dccSendAdvanced::OptionsWidget_dccSendAdvanced(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("dccsend_advanced_options_widget");
@@ -293,18 +293,18 @@ KviDccSendAdvancedOptionsWidget::KviDccSendAdvancedOptionsWidget(QWidget * paren
 	addRowSpacer(0,3,0,4);
 }
 
-KviDccSendAdvancedOptionsWidget::~KviDccSendAdvancedOptionsWidget()
+OptionsWidget_dccSendAdvanced::~OptionsWidget_dccSendAdvanced()
 {
 }
 
 
-//KviDccSendOptionsWidget::enableStuff(bool)
+//OptionsWidget_dccSend::enableStuff(bool)
 //{
 //	m_pOpenMinimizedAutoAccept->setEnabled(m_pAutoAccept->isChecked() && !m_pOpenMinimized->isChecked());
 //}
 
 
-KviDccChatOptionsWidget::KviDccChatOptionsWidget(QWidget * parent)
+OptionsWidget_dccChat::OptionsWidget_dccChat(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("dccchat_options_widget");
@@ -335,12 +335,12 @@ KviDccChatOptionsWidget::KviDccChatOptionsWidget(QWidget * parent)
 	addRowSpacer(0,4,0,4);
 }
 
-KviDccChatOptionsWidget::~KviDccChatOptionsWidget()
+OptionsWidget_dccChat::~OptionsWidget_dccChat()
 {
 }
 
 
-KviDccVoiceOptionsWidget::KviDccVoiceOptionsWidget(QWidget *p):KviOptionsWidget(p)
+OptionsWidget_dccVoice::OptionsWidget_dccVoice(QWidget *p):KviOptionsWidget(p)
 {
 	createLayout();
 
@@ -363,10 +363,10 @@ KviDccVoiceOptionsWidget::KviDccVoiceOptionsWidget(QWidget *p):KviOptionsWidget(
 	addRowSpacer(0,7,0,7);
 }
 
-KviDccVoiceOptionsWidget::~KviDccVoiceOptionsWidget()
+OptionsWidget_dccVoice::~OptionsWidget_dccVoice()
 {
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_dcc.moc"
+#include "m_OptionsWidget_dcc.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_dcc.h b/src/modules/options/OptionsWidget_dcc.h
index b88886d76..c4ed7b27e 100644
--- a/src/modules/options/optw_dcc.h
+++ b/src/modules/options/OptionsWidget_dcc.h
@@ -2,7 +2,7 @@
 #define _OPTW_DCC_H_
 //=============================================================================
 //
-//   File : optw_dcc.h
+//   File : OptionsWidget_dcc.h
 //   Creation date : Fri Aug 17 22:08:08 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -31,12 +31,12 @@
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviDccOptionsWidget 70000
 #define KVI_OPTIONS_WIDGET_CONTAINER_KviDccOptionsWidget true
 
-class KviDccOptionsWidget : public KviOptionsWidget
+class OptionsWidget_dcc : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviDccOptionsWidget(QWidget * parent);
-	~KviDccOptionsWidget();
+	OptionsWidget_dcc(QWidget * parent);
+	~OptionsWidget_dcc();
 };
 
 
@@ -44,27 +44,27 @@ public:
 #define KVI_OPTIONS_WIDGET_ICON_KviDccGeneralOptionsWidget KVI_SMALLICON_DCCERROR
 #define KVI_OPTIONS_WIDGET_NAME_KviDccGeneralOptionsWidget __tr2qs_no_lookup("General")
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviDccGeneralOptionsWidget 70000
-#define KVI_OPTIONS_WIDGET_PARENT_KviDccGeneralOptionsWidget KviDccOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviDccGeneralOptionsWidget OptionsWidget_dcc
 
-class KviDccGeneralOptionsWidget : public KviOptionsWidget
+class OptionsWidget_dccGeneral : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviDccGeneralOptionsWidget(QWidget * parent);
-	~KviDccGeneralOptionsWidget();
+	OptionsWidget_dccGeneral(QWidget * parent);
+	~OptionsWidget_dccGeneral();
 };
 
 #define KVI_OPTIONS_WIDGET_ICON_KviDccAdvancedOptionsWidget KVI_SMALLICON_DCCERROR
 #define KVI_OPTIONS_WIDGET_NAME_KviDccAdvancedOptionsWidget __tr2qs_no_lookup("Advanced")
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviDccAdvancedOptionsWidget 70000
-#define KVI_OPTIONS_WIDGET_PARENT_KviDccAdvancedOptionsWidget KviDccOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviDccAdvancedOptionsWidget OptionsWidget_dcc
 
-class KviDccAdvancedOptionsWidget : public KviOptionsWidget
+class OptionsWidget_dccAdvanced : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviDccAdvancedOptionsWidget(QWidget * parent);
-	~KviDccAdvancedOptionsWidget();
+	OptionsWidget_dccAdvanced(QWidget * parent);
+	~OptionsWidget_dccAdvanced();
 };
 
 
@@ -72,69 +72,69 @@ public:
 
 #define KVI_OPTIONS_WIDGET_ICON_KviDccSendOptionsWidget KVI_SMALLICON_DCCMSG
 #define KVI_OPTIONS_WIDGET_NAME_KviDccSendOptionsWidget __tr2qs_no_lookup("File Transfer")
-#define KVI_OPTIONS_WIDGET_PARENT_KviDccSendOptionsWidget KviDccOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviDccSendOptionsWidget OptionsWidget_dcc
 #define KVI_OPTIONS_WIDGET_CONTAINER_KviDccSendOptionsWidget true
 
 
-class KviDccSendOptionsWidget : public KviOptionsWidget
+class OptionsWidget_dccSend : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviDccSendOptionsWidget(QWidget * parent);
-	~KviDccSendOptionsWidget();
+	OptionsWidget_dccSend(QWidget * parent);
+	~OptionsWidget_dccSend();
 };
 
 #define KVI_OPTIONS_WIDGET_ICON_KviDccSendGeneralOptionsWidget KVI_SMALLICON_DCCMSG
 #define KVI_OPTIONS_WIDGET_NAME_KviDccSendGeneralOptionsWidget __tr2qs_no_lookup("General")
-#define KVI_OPTIONS_WIDGET_PARENT_KviDccSendGeneralOptionsWidget KviDccSendOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviDccSendGeneralOptionsWidget OptionsWidget_dccSend
 
 
-class KviDccSendGeneralOptionsWidget : public KviOptionsWidget
+class OptionsWidget_dccSendGeneral : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviDccSendGeneralOptionsWidget(QWidget * parent);
-	~KviDccSendGeneralOptionsWidget();
+	OptionsWidget_dccSendGeneral(QWidget * parent);
+	~OptionsWidget_dccSendGeneral();
 };
 
 
 #define KVI_OPTIONS_WIDGET_ICON_KviDccSendAdvancedOptionsWidget KVI_SMALLICON_DCCMSG
 #define KVI_OPTIONS_WIDGET_NAME_KviDccSendAdvancedOptionsWidget __tr2qs_no_lookup("Advanced")
-#define KVI_OPTIONS_WIDGET_PARENT_KviDccSendAdvancedOptionsWidget KviDccSendOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviDccSendAdvancedOptionsWidget OptionsWidget_dccSend
 
-class KviDccSendAdvancedOptionsWidget : public KviOptionsWidget
+class OptionsWidget_dccSendAdvanced : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviDccSendAdvancedOptionsWidget(QWidget * parent);
-	~KviDccSendAdvancedOptionsWidget();
+	OptionsWidget_dccSendAdvanced(QWidget * parent);
+	~OptionsWidget_dccSendAdvanced();
 };
 
 
 #define KVI_OPTIONS_WIDGET_ICON_KviDccChatOptionsWidget KVI_SMALLICON_DCCREQUEST
 #define KVI_OPTIONS_WIDGET_NAME_KviDccChatOptionsWidget __tr2qs_no_lookup("Chat")
-#define KVI_OPTIONS_WIDGET_PARENT_KviDccChatOptionsWidget KviDccOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviDccChatOptionsWidget OptionsWidget_dcc
 #define KVI_OPTIONS_WIDGET_NOTCONTAINED_KviDccChatOptionsWidget true
 
-class KviDccChatOptionsWidget : public KviOptionsWidget
+class OptionsWidget_dccChat : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviDccChatOptionsWidget(QWidget * parent);
-	~KviDccChatOptionsWidget();
+	OptionsWidget_dccChat(QWidget * parent);
+	~OptionsWidget_dccChat();
 };
 
 #define KVI_OPTIONS_WIDGET_ICON_KviDccVoiceOptionsWidget KVI_SMALLICON_DCCVOICE
 #define KVI_OPTIONS_WIDGET_NAME_KviDccVoiceOptionsWidget __tr2qs_no_lookup("Voice")
-#define KVI_OPTIONS_WIDGET_PARENT_KviDccVoiceOptionsWidget KviDccOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviDccVoiceOptionsWidget OptionsWidget_dcc
 #define KVI_OPTIONS_WIDGET_NOTCONTAINED_KviDccVoiceOptionsWidget true
 
-class KviDccVoiceOptionsWidget : public KviOptionsWidget
+class OptionsWidget_dccVoice : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviDccVoiceOptionsWidget(QWidget *);
-	~KviDccVoiceOptionsWidget();
+	OptionsWidget_dccVoice(QWidget *);
+	~OptionsWidget_dccVoice();
 };
 
 
diff --git a/src/modules/options/optw_generalopt.cpp b/src/modules/options/OptionsWidget_general.cpp
index fac50ac3f..b3836826a 100644
--- a/src/modules/options/optw_generalopt.cpp
+++ b/src/modules/options/OptionsWidget_general.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_generalopt.cpp
+//   File : OptionsWidget_general.cpp
 //   Creation date : Wed Nov 19 09:25:16 2005 GMT by Grifisx & Noldor
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,14 +22,14 @@
 //
 //=============================================================================
 
-#include "optw_generalopt.h"
+#include "OptionsWidget_general.h"
 
 #include "kvi_settings.h"
 #include "KviLocale.h"
 #include "KviOptions.h"
 
 
-KviGeneralOptOptionsWidget::KviGeneralOptOptionsWidget(QWidget * parent)
+OptionsWidget_general::OptionsWidget_general(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("generalopt_options_widget");
@@ -41,11 +41,11 @@ KviGeneralOptOptionsWidget::KviGeneralOptOptionsWidget(QWidget * parent)
 	addAdvancedButton(4,1,4,1);
 }
 
-KviGeneralOptOptionsWidget::~KviGeneralOptOptionsWidget()
+OptionsWidget_general::~OptionsWidget_general()
 {
 }
 
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_generalopt.moc"
+#include "m_OptionsWidget_general.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_generalopt.h b/src/modules/options/OptionsWidget_general.h
index d6ca980c1..5b24c77ee 100644
--- a/src/modules/options/optw_generalopt.h
+++ b/src/modules/options/OptionsWidget_general.h
@@ -2,7 +2,7 @@
 #define _OPTW_GENERALOPT_H_
 //=============================================================================
 //
-//   File : optw_generalopt.h
+//   File : OptionsWidget_general.h
 //   Creation date : Wed Nov 19 09:25:16 2005 GMT by Grifisx & Noldor
 //
 //   This file is part of the KVIrc irc client distribution
@@ -30,12 +30,12 @@
 #define KVI_OPTIONS_WIDGET_NAME_KviGeneralOptOptionsWidget __tr2qs_no_lookup("General options")
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviGeneralOptOptionsWidget 40000
 
-class KviGeneralOptOptionsWidget : public KviOptionsWidget
+class OptionsWidget_general : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviGeneralOptOptionsWidget(QWidget * parent);
-	~KviGeneralOptOptionsWidget();
+	OptionsWidget_general(QWidget * parent);
+	~OptionsWidget_general();
 };
 
 #endif //_OPTW_CONNECTION_H_
diff --git a/src/modules/options/optw_identity.cpp b/src/modules/options/OptionsWidget_identity.cpp
index 7ef4ac1d3..1066ae6c7 100644
--- a/src/modules/options/optw_identity.cpp
+++ b/src/modules/options/OptionsWidget_identity.cpp
@@ -1,6 +1,6 @@
 //============================================================================
 //
-//   File : optw_identity.cpp
+//   File : OptionsWidget_identity.cpp
 //   Creation date : Tue Nov 14 2000 23:06:53 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //============================================================================
 
-#include "optw_identity.h"
+#include "OptionsWidget_identity.h"
 
 #include "kvi_defaults.h"
 #include "kvi_settings.h"
@@ -53,7 +53,7 @@
 #include <QCloseEvent>
 #include <QFileInfo>
 
-KviNickAlternativesDialog::KviNickAlternativesDialog(QWidget * par,const QString &n1,const QString &n2,const QString &n3)
+NickAlternativesDialog::NickAlternativesDialog(QWidget * par,const QString &n1,const QString &n2,const QString &n3)
 : QDialog(par)
 {
 	QGridLayout * g = new QGridLayout(this);
@@ -103,11 +103,11 @@ KviNickAlternativesDialog::KviNickAlternativesDialog(QWidget * par,const QString
 	g->setColumnStretch(0,1);
 }
 
-KviNickAlternativesDialog::~KviNickAlternativesDialog()
+NickAlternativesDialog::~NickAlternativesDialog()
 {
 }
 
-void KviNickAlternativesDialog::fill(QString &n1,QString &n2,QString &n3)
+void NickAlternativesDialog::fill(QString &n1,QString &n2,QString &n3)
 {
 	n1 = m_pNickEdit1->text();
 	n2 = m_pNickEdit2->text();
@@ -115,7 +115,7 @@ void KviNickAlternativesDialog::fill(QString &n1,QString &n2,QString &n3)
 }
 
 
-KviAvatarDownloadDialog::KviAvatarDownloadDialog(QWidget * par,const QString &szUrl)
+AvatarDownloadDialog::AvatarDownloadDialog(QWidget * par,const QString &szUrl)
 : QDialog(par)
 {
 	setWindowTitle(__tr2qs_ctx("Avatar Download - KVIrc","options"));
@@ -141,12 +141,12 @@ KviAvatarDownloadDialog::KviAvatarDownloadDialog(QWidget * par,const QString &sz
 	setMinimumSize(250,120);
 }
 
-KviAvatarDownloadDialog::~KviAvatarDownloadDialog()
+AvatarDownloadDialog::~AvatarDownloadDialog()
 {
 	delete m_pRequest;
 }
 
-void KviAvatarDownloadDialog::startDownload()
+void AvatarDownloadDialog::startDownload()
 {
 	connect(m_pRequest,SIGNAL(terminated(bool)),this,SLOT(downloadTerminated(bool)));
 	connect(m_pRequest,SIGNAL(status(const QString &)),this,SLOT(downloadMessage(const QString &)));
@@ -163,20 +163,20 @@ void KviAvatarDownloadDialog::startDownload()
 	}
 }
 
-void KviAvatarDownloadDialog::closeEvent(QCloseEvent * e)
+void AvatarDownloadDialog::closeEvent(QCloseEvent * e)
 {
 	m_szErrorMessage = __tr2qs_ctx("Download aborted by user","options");
 	e->ignore();
 	reject();
 }
 
-void KviAvatarDownloadDialog::cancelClicked()
+void AvatarDownloadDialog::cancelClicked()
 {
 	m_szErrorMessage = __tr2qs_ctx("Download aborted by user","options");
 	reject();
 }
 
-void KviAvatarDownloadDialog::downloadMessage(const QString &szMsg)
+void AvatarDownloadDialog::downloadMessage(const QString &szMsg)
 {
 	if(!szMsg.isEmpty())
 	{
@@ -187,7 +187,7 @@ void KviAvatarDownloadDialog::downloadMessage(const QString &szMsg)
 	}
 }
 
-void KviAvatarDownloadDialog::downloadTerminated(bool bSuccess)
+void AvatarDownloadDialog::downloadTerminated(bool bSuccess)
 {
 	if(bSuccess)
 	{
@@ -198,7 +198,7 @@ void KviAvatarDownloadDialog::downloadTerminated(bool bSuccess)
 	}
 }
 
-KviAvatarSelectionDialog::KviAvatarSelectionDialog(QWidget * par,const QString &szInitialPath)
+AvatarSelectionDialog::AvatarSelectionDialog(QWidget * par,const QString &szInitialPath)
 : QDialog(par)
 {
 	setWindowTitle(__tr2qs_ctx("Choose Avatar - KVIrc","options"));
@@ -244,22 +244,22 @@ KviAvatarSelectionDialog::KviAvatarSelectionDialog(QWidget * par,const QString &
 	g->setColumnStretch(0,1);
 }
 
-KviAvatarSelectionDialog::~KviAvatarSelectionDialog()
+AvatarSelectionDialog::~AvatarSelectionDialog()
 {
 }
 
-void KviAvatarSelectionDialog::okClicked()
+void AvatarSelectionDialog::okClicked()
 {
 	m_szAvatarName = m_pLineEdit->text().trimmed();
 	accept();
 }
 
-void KviAvatarSelectionDialog::cancelClicked()
+void AvatarSelectionDialog::cancelClicked()
 {
 	reject();
 }
 
-void KviAvatarSelectionDialog::chooseFileClicked()
+void AvatarSelectionDialog::chooseFileClicked()
 {
 	QString tmp;
 	if(KviFileDialog::askForOpenFileName(tmp,__tr2qs_ctx("Choose an Image File - KVIrc","options"),QString(),KVI_FILTER_IMAGE,false,true,this))
@@ -268,19 +268,19 @@ void KviAvatarSelectionDialog::chooseFileClicked()
 	}
 }
 
-void KviAvatarSelectionDialog::closeEvent(QCloseEvent * e)
+void AvatarSelectionDialog::closeEvent(QCloseEvent * e)
 {
 	e->ignore();
 	reject();
 }
 
 
-KviIdentityOptionsWidget::KviIdentityOptionsWidget(QWidget * parent)
+OptionsWidget_identity::OptionsWidget_identity(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 }
 
-KviIdentityOptionsWidget::~KviIdentityOptionsWidget()
+OptionsWidget_identity::~OptionsWidget_identity()
 {
 }
 
@@ -413,7 +413,7 @@ KviIdentityGeneralOptionsWidget::~KviIdentityGeneralOptionsWidget()
 
 void KviIdentityGeneralOptionsWidget::setNickAlternatives()
 {
-	KviNickAlternativesDialog * dlg = new KviNickAlternativesDialog(this,m_szAltNicknames[0],m_szAltNicknames[1],m_szAltNicknames[2]);
+	NickAlternativesDialog * dlg = new NickAlternativesDialog(this,m_szAltNicknames[0],m_szAltNicknames[1],m_szAltNicknames[2]);
 	if(dlg->exec() != QDialog::Accepted)return;
 	dlg->fill(m_szAltNicknames[0],m_szAltNicknames[1],m_szAltNicknames[2]);
 	delete dlg;
@@ -454,7 +454,7 @@ void KviIdentityGeneralOptionsWidget::commit()
 }
 
 
-KviIdentityAvatarOptionsWidget::KviIdentityAvatarOptionsWidget(QWidget * parent)
+OptionsWidget_identityAvatar::OptionsWidget_identityAvatar(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	createLayout();
@@ -503,12 +503,12 @@ KviIdentityAvatarOptionsWidget::KviIdentityAvatarOptionsWidget(QWidget * parent)
 	layout()->setRowStretch(1,2);
 }
 
-KviIdentityAvatarOptionsWidget::~KviIdentityAvatarOptionsWidget()
+OptionsWidget_identityAvatar::~OptionsWidget_identityAvatar()
 {
 	delete m_pLocalAvatar;
 }
 
-void KviIdentityAvatarOptionsWidget::commit(void)
+void OptionsWidget_identityAvatar::commit(void)
 {
 	KviOptionsWidget::commit();
 
@@ -525,11 +525,11 @@ void KviIdentityAvatarOptionsWidget::commit(void)
 	g_pApp->setAvatarFromOptions();
 }
 
-void KviIdentityAvatarOptionsWidget::chooseAvatar()
+void OptionsWidget_identityAvatar::chooseAvatar()
 {
 	QString szCurrent = m_pAvatarNameEdit->text();
 
-	KviAvatarSelectionDialog dlg(this,szCurrent);
+	AvatarSelectionDialog dlg(this,szCurrent);
 	if(dlg.exec() != QDialog::Accepted)return;
 
 	szCurrent = dlg.avatarName();
@@ -543,7 +543,7 @@ void KviIdentityAvatarOptionsWidget::chooseAvatar()
 		if(!a)
 		{
 			// no cache... try downloading
-			KviAvatarDownloadDialog dlg(this,szCurrent);
+			AvatarDownloadDialog dlg(this,szCurrent);
 			if(dlg.exec() == QDialog::Accepted)
 			{
 				// downloaded!
@@ -639,7 +639,7 @@ void KviIdentityAvatarOptionsWidget::chooseAvatar()
 }
 
 
-KviIdentityAdvancedOptionsWidget::KviIdentityAdvancedOptionsWidget(QWidget * parent)
+OptionsWidget_identityAdvanced::OptionsWidget_identityAdvanced(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	m_pISelector=0;
@@ -675,11 +675,11 @@ KviIdentityAdvancedOptionsWidget::KviIdentityAdvancedOptionsWidget(QWidget * par
 	addRowSpacer(0,2,0,2);
 }
 
-KviIdentityAdvancedOptionsWidget::~KviIdentityAdvancedOptionsWidget()
+OptionsWidget_identityAdvanced::~OptionsWidget_identityAdvanced()
 {
 }
 
-void KviIdentityAdvancedOptionsWidget::commit()
+void OptionsWidget_identityAdvanced::commit()
 {
 	KviOptionsWidget::commit();
 
@@ -690,7 +690,7 @@ void KviIdentityAdvancedOptionsWidget::commit()
 	KVI_OPTION_STRING(KviOption_stringDefaultUserMode) = m_sModeStr.ptr();
 }
 
-KviIdentityProfileOptionsWidget::KviIdentityProfileOptionsWidget(QWidget * pParent)
+OptionsWidget_identityProfile::OptionsWidget_identityProfile(QWidget * pParent)
 : KviOptionsWidget(pParent)
 {
 	setObjectName("identity_profiles_option_widget");
@@ -766,11 +766,11 @@ KviIdentityProfileOptionsWidget::KviIdentityProfileOptionsWidget(QWidget * pPare
 	toggleControls();
 }
 
-KviIdentityProfileOptionsWidget::~KviIdentityProfileOptionsWidget()
+OptionsWidget_identityProfile::~OptionsWidget_identityProfile()
 {
 }
 
-void KviIdentityProfileOptionsWidget::toggleControls()
+void OptionsWidget_identityProfile::toggleControls()
 {
 	bool bEnabled = m_pProfilesCheck->isChecked();
 	m_pTreeWidget->setEnabled(bEnabled);
@@ -781,14 +781,14 @@ void KviIdentityProfileOptionsWidget::toggleControls()
 	m_pBtnDelProfile->setEnabled(bEnabled);
 }
 
-void KviIdentityProfileOptionsWidget::addProfileEntry()
+void OptionsWidget_identityProfile::addProfileEntry()
 {
 	KviIdentityProfile profile;
 	m_iCurrentEditedProfile = -1;
 
 	if(m_pEditor)
 		delete m_pEditor;
-	m_pEditor = new KviIdentityProfileEditor(this);
+	m_pEditor = new IdentityProfileEditor(this);
 
 	if(m_pEditor->editProfile(&profile))
 	{
@@ -802,7 +802,7 @@ void KviIdentityProfileOptionsWidget::addProfileEntry()
 	}
 }
 
-void KviIdentityProfileOptionsWidget::editProfileEntry()
+void OptionsWidget_identityProfile::editProfileEntry()
 {
 	QTreeWidgetItem * pItem = (QTreeWidgetItem *)m_pTreeWidget->currentItem();
 	if(!pItem)
@@ -821,7 +821,7 @@ void KviIdentityProfileOptionsWidget::editProfileEntry()
 
 	if(m_pEditor)
 		delete m_pEditor;
-	m_pEditor = new KviIdentityProfileEditor(this);
+	m_pEditor = new IdentityProfileEditor(this);
 	if(m_pEditor->editProfile(&profile))
 	{
 		pItem->setText(0,profile.name());
@@ -833,7 +833,7 @@ void KviIdentityProfileOptionsWidget::editProfileEntry()
 	}
 }
 
-void KviIdentityProfileOptionsWidget::editProfileOkPressed()
+void OptionsWidget_identityProfile::editProfileOkPressed()
 {
 	for(int i=0; i < m_pTreeWidget->topLevelItemCount(); i++)
 	{
@@ -847,7 +847,7 @@ void KviIdentityProfileOptionsWidget::editProfileOkPressed()
 	m_pEditor->accept();
 }
 
-void KviIdentityProfileOptionsWidget::delProfileEntry()
+void OptionsWidget_identityProfile::delProfileEntry()
 {
 	QTreeWidgetItem * pItem = (QTreeWidgetItem *)m_pTreeWidget->currentItem();
 	if(!pItem)
@@ -857,7 +857,7 @@ void KviIdentityProfileOptionsWidget::delProfileEntry()
 	toggleControls();
 }
 
-void KviIdentityProfileOptionsWidget::commit()
+void OptionsWidget_identityProfile::commit()
 {
 	KviIdentityProfileSet::instance()->clear();
 	if(m_pTreeWidget->topLevelItemCount())
@@ -883,7 +883,7 @@ void KviIdentityProfileOptionsWidget::commit()
 	KviOptionsWidget::commit();
 }
 
-KviIdentityProfileEditor::KviIdentityProfileEditor(QWidget * pParent)
+IdentityProfileEditor::IdentityProfileEditor(QWidget * pParent)
 : QDialog(pParent)
 {
 	setObjectName("identity_profile_editor");
@@ -963,11 +963,11 @@ KviIdentityProfileEditor::KviIdentityProfileEditor(QWidget * pParent)
 	setMinimumWidth(250);
 }
 
-KviIdentityProfileEditor::~KviIdentityProfileEditor()
+IdentityProfileEditor::~IdentityProfileEditor()
 {
 }
 
-bool KviIdentityProfileEditor::editProfile(KviIdentityProfile * pProfile)
+bool IdentityProfileEditor::editProfile(KviIdentityProfile * pProfile)
 {
 	// Fill in the fields
 	m_pNameEdit->setText(pProfile->name().isEmpty() ? QString(m_szName) : pProfile->name());
@@ -994,7 +994,7 @@ bool KviIdentityProfileEditor::editProfile(KviIdentityProfile * pProfile)
 	return true;
 }
 
-void KviIdentityProfileEditor::toggleButton(const QString & szText)
+void IdentityProfileEditor::toggleButton(const QString & szText)
 {
 	bool bEnabled = true;
 
@@ -1013,5 +1013,5 @@ void KviIdentityProfileEditor::toggleButton(const QString & szText)
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_identity.moc"
+#include "m_OptionsWidget_identity.moc"
 #endif //COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_identity.h b/src/modules/options/OptionsWidget_identity.h
index ff4013e46..58628e415 100644
--- a/src/modules/options/optw_identity.h
+++ b/src/modules/options/OptionsWidget_identity.h
@@ -3,7 +3,7 @@
 
 //=============================================================================
 //
-//   File : optw_identity.h
+//   File : OptionsWidget_identity.h
 //   Creation date : Tue Nov 14 2000 23:06:12 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -42,13 +42,13 @@ class KviHttpRequest;
 class QTreeWidget;
 class KviIdentityProfile;
 
-class KviNickAlternativesDialog : public QDialog
+class NickAlternativesDialog : public QDialog
 {
 	friend class KviIdentityGeneralOptionsWidget;
 	Q_OBJECT
 protected:
-	KviNickAlternativesDialog(QWidget * par,const QString &n1,const QString &n2,const QString &n3);
-	~KviNickAlternativesDialog();
+	NickAlternativesDialog(QWidget * par,const QString &n1,const QString &n2,const QString &n3);
+	~NickAlternativesDialog();
 protected:
 	QLineEdit * m_pNickEdit1;
 	QLineEdit * m_pNickEdit2;
@@ -57,13 +57,13 @@ protected:
 	void fill(QString &n1,QString &n2,QString &n3);
 };
 
-class KviAvatarSelectionDialog : public QDialog
+class AvatarSelectionDialog : public QDialog
 {
-	friend class KviIdentityAvatarOptionsWidget;
+	friend class OptionsWidget_identityAvatar;
 	Q_OBJECT
 public:
-	KviAvatarSelectionDialog(QWidget * par,const QString &szInitialPath);
-	~KviAvatarSelectionDialog();
+	AvatarSelectionDialog(QWidget * par,const QString &szInitialPath);
+	~AvatarSelectionDialog();
 protected:
 	QLineEdit   * m_pLineEdit;
 	QString       m_szAvatarName;
@@ -77,13 +77,13 @@ protected slots:
 };
 
 
-class KviAvatarDownloadDialog : public QDialog
+class AvatarDownloadDialog : public QDialog
 {
-	friend class KviIdentityAvatarOptionsWidget;
+	friend class OptionsWidget_identityAvatar;
 	Q_OBJECT
 public:
-	KviAvatarDownloadDialog(QWidget * par,const QString &szUrl);
-	~KviAvatarDownloadDialog();
+	AvatarDownloadDialog(QWidget * par,const QString &szUrl);
+	~AvatarDownloadDialog();
 protected:
 	KviHttpRequest * m_pRequest;
 	QLabel         * m_pOutput;
@@ -104,13 +104,13 @@ protected slots:
 
 
 
-class KviIdentityProfileEditor : public QDialog
+class IdentityProfileEditor : public QDialog
 {
-	friend class KviIdentityProfileOptionsWidget;
+	friend class OptionsWidget_identityProfile;
 	Q_OBJECT
 public:
-	KviIdentityProfileEditor(QWidget * pParent);
-	~KviIdentityProfileEditor();
+	IdentityProfileEditor(QWidget * pParent);
+	~IdentityProfileEditor();
 protected:
 	QString       m_szName;
 	QString       m_szNetwork;
@@ -139,12 +139,12 @@ protected slots:
 #define KVI_OPTIONS_WIDGET_CONTAINER_KviIdentityOptionsWidget true
 
 
-class KviIdentityOptionsWidget : public KviOptionsWidget
+class OptionsWidget_identity : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviIdentityOptionsWidget(QWidget * parent);
-	~KviIdentityOptionsWidget();
+	OptionsWidget_identity(QWidget * parent);
+	~OptionsWidget_identity();
 };
 
 
@@ -152,7 +152,7 @@ public:
 #define KVI_OPTIONS_WIDGET_ICON_KviIdentityGeneralOptionsWidget KVI_SMALLICON_WHO
 #define KVI_OPTIONS_WIDGET_NAME_KviIdentityGeneralOptionsWidget __tr2qs_no_lookup("General")
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviIdentityGeneralOptionsWidget 90000
-#define KVI_OPTIONS_WIDGET_PARENT_KviIdentityGeneralOptionsWidget KviIdentityOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviIdentityGeneralOptionsWidget OptionsWidget_identity
 
 
 class KviIdentityGeneralOptionsWidget : public KviOptionsWidget
@@ -176,15 +176,15 @@ protected:
 #define KVI_OPTIONS_WIDGET_ICON_KviIdentityAvatarOptionsWidget KVI_SMALLICON_AVATAR
 #define KVI_OPTIONS_WIDGET_NAME_KviIdentityAvatarOptionsWidget __tr2qs_no_lookup("Avatar")
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviIdentityAvatarOptionsWidget 80000
-#define KVI_OPTIONS_WIDGET_PARENT_KviIdentityAvatarOptionsWidget KviIdentityOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviIdentityAvatarOptionsWidget OptionsWidget_identity
 
 
-class KviIdentityAvatarOptionsWidget : public KviOptionsWidget
+class OptionsWidget_identityAvatar : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviIdentityAvatarOptionsWidget(QWidget * pParent);
-	~KviIdentityAvatarOptionsWidget();
+	OptionsWidget_identityAvatar(QWidget * pParent);
+	~OptionsWidget_identityAvatar();
 protected:
 	QCheckBox        * m_pUseAvatarCheck;
 	QLineEdit        * m_pAvatarNameEdit;
@@ -201,15 +201,15 @@ protected:
 #define KVI_OPTIONS_WIDGET_ICON_KviIdentityAdvancedOptionsWidget KVI_SMALLICON_SPY
 #define KVI_OPTIONS_WIDGET_NAME_KviIdentityAdvancedOptionsWidget __tr2qs_no_lookup("Advanced")
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviIdentityAdvancedOptionsWidget 70000
-#define KVI_OPTIONS_WIDGET_PARENT_KviIdentityAdvancedOptionsWidget KviIdentityOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviIdentityAdvancedOptionsWidget OptionsWidget_identity
 
 
-class KviIdentityAdvancedOptionsWidget : public KviOptionsWidget
+class OptionsWidget_identityAdvanced : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviIdentityAdvancedOptionsWidget(QWidget * pParent);
-	~KviIdentityAdvancedOptionsWidget();
+	OptionsWidget_identityAdvanced(QWidget * pParent);
+	~OptionsWidget_identityAdvanced();
 protected:
 	bool               m_bI;
 	bool               m_bW;
@@ -226,21 +226,21 @@ protected:
 #define KVI_OPTIONS_WIDGET_ICON_KviIdentityProfileOptionsWidget KVI_SMALLICON_REGUSERS
 #define KVI_OPTIONS_WIDGET_NAME_KviIdentityProfileOptionsWidget __tr2qs_no_lookup("Profiles")
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviIdentityProfileOptionsWidget 60000
-#define KVI_OPTIONS_WIDGET_PARENT_KviIdentityProfileOptionsWidget KviIdentityOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviIdentityProfileOptionsWidget OptionsWidget_identity
 
-class KviIdentityProfileOptionsWidget : public KviOptionsWidget
+class OptionsWidget_identityProfile : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviIdentityProfileOptionsWidget(QWidget * pParent);
-	~KviIdentityProfileOptionsWidget();
+	OptionsWidget_identityProfile(QWidget * pParent);
+	~OptionsWidget_identityProfile();
 protected:
 	QTreeWidget              * m_pTreeWidget;
 	QCheckBox                * m_pProfilesCheck;
 	QPushButton              * m_pBtnAddProfile;
 	QPushButton              * m_pBtnEditProfile;
 	QPushButton              * m_pBtnDelProfile;
-	KviIdentityProfileEditor * m_pEditor;
+	IdentityProfileEditor * m_pEditor;
 	int                        m_iCurrentEditedProfile;
 public:
 	virtual void commit();
diff --git a/src/modules/options/optw_ignore.cpp b/src/modules/options/OptionsWidget_ignore.cpp
index a08396634..c8cfc6999 100644
--- a/src/modules/options/optw_ignore.cpp
+++ b/src/modules/options/OptionsWidget_ignore.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_ignore.h
+//   File : OptionsWidget_ignore.h
 //   Creation date : Thu Feb 12 15:11:29 2002 GMT by Juanjo �lvarez
 //
 //   This file is part of the KVIrc irc client distribution
@@ -23,7 +23,7 @@
 //
 //=============================================================================
 
-#include "optw_ignore.h"
+#include "OptionsWidget_ignore.h"
 
 #include "KviOptions.h"
 #include "KviLocale.h"
@@ -31,7 +31,7 @@
 #include <QLayout>
 
 
-KviIgnoreOptionsWidget::KviIgnoreOptionsWidget(QWidget * parent)
+OptionsWidget_ignore::OptionsWidget_ignore(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("ignore_options_widget");
@@ -50,11 +50,11 @@ KviIgnoreOptionsWidget::KviIgnoreOptionsWidget(QWidget * parent)
 	addRowSpacer(0,2,0,2);
 }
 
-KviIgnoreOptionsWidget::~KviIgnoreOptionsWidget()
+OptionsWidget_ignore::~OptionsWidget_ignore()
 {
 }
 
-void KviIgnoreOptionsWidget::enableVerbose(bool)
+void OptionsWidget_ignore::enableVerbose(bool)
 {
 	m_pVerboseIgnore->setEnabled(m_pIgnorePrivmsg->isChecked() || m_pIgnoreNotice->isChecked());
 }
@@ -62,5 +62,5 @@ void KviIgnoreOptionsWidget::enableVerbose(bool)
 
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_ignore.moc"
+#include "m_OptionsWidget_ignore.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_ignore.h b/src/modules/options/OptionsWidget_ignore.h
index 65f1c3d3e..210be1b48 100644
--- a/src/modules/options/optw_ignore.h
+++ b/src/modules/options/OptionsWidget_ignore.h
@@ -2,7 +2,7 @@
 #define _OPTW_IGNORE_H_
 //=============================================================================
 //
-//   File : optw_ignore.h
+//   File : OptionsWidget_ignore.h
 //   Creation date : Thu Feb 12 15:11:30 2002 GMT by Juanjo �lvarez
 //
 //   This file is part of the KVIrc irc client distribution
@@ -30,15 +30,15 @@
 
 #define KVI_OPTIONS_WIDGET_ICON_KviIgnoreOptionsWidget KVI_SMALLICON_IGNORE
 #define KVI_OPTIONS_WIDGET_NAME_KviIgnoreOptionsWidget __tr2qs_no_lookup("Ignore")
-#define KVI_OPTIONS_WIDGET_PARENT_KviIgnoreOptionsWidget KviProtectionOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviIgnoreOptionsWidget OptionsWidget_protection
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviIgnoreOptionsWidget __tr2qs_no_lookup("protection")
 
-class KviIgnoreOptionsWidget : public KviOptionsWidget
+class OptionsWidget_ignore : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviIgnoreOptionsWidget(QWidget * parent);
-	~KviIgnoreOptionsWidget();
+	OptionsWidget_ignore(QWidget * parent);
+	~OptionsWidget_ignore();
 public:
 	KviBoolSelector * m_pIgnorePrivmsg;
 	KviBoolSelector * m_pIgnoreNotice;
diff --git a/src/modules/options/optw_input.cpp b/src/modules/options/OptionsWidget_input.cpp
index 2df8bbd23..78bdc3cce 100644
--- a/src/modules/options/optw_input.cpp
+++ b/src/modules/options/OptionsWidget_input.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_input.cpp
+//   File : OptionsWidget_input.cpp
 //   Creation date : Sat Aug 11 2001 04:25:52 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,14 +22,14 @@
 //
 //=============================================================================
 
-#include "optw_input.h"
+#include "OptionsWidget_input.h"
 
 #include "KviOptions.h"
 #include "KviLocale.h"
 
 #include <QLayout>
 
-KviInputLookOptionsWidget::KviInputLookOptionsWidget(QWidget * parent)
+OptionsWidget_inputLook::OptionsWidget_inputLook(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("inputlook_options_widget");
@@ -97,11 +97,11 @@ KviInputLookOptionsWidget::KviInputLookOptionsWidget(QWidget * parent)
 	layout()->setRowStretch(7,1);
 }
 
-KviInputLookOptionsWidget::~KviInputLookOptionsWidget()
+OptionsWidget_inputLook::~OptionsWidget_inputLook()
 {
 }
 
-void KviInputLookOptionsWidget::commit()
+void OptionsWidget_inputLook::commit()
 {
 	int iFlags=0;
 	switch(m_pHorizontalAlign->currentIndex())
@@ -134,7 +134,7 @@ void KviInputLookOptionsWidget::commit()
 }
 
 
-KviInputFeaturesOptionsWidget::KviInputFeaturesOptionsWidget(QWidget * parent)
+OptionsWidget_inputFeatures::OptionsWidget_inputFeatures(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("ircviewfeatures_options_widget");
@@ -158,10 +158,10 @@ KviInputFeaturesOptionsWidget::KviInputFeaturesOptionsWidget(QWidget * parent)
 	addRowSpacer(0,6,0,6);
 }
 
-KviInputFeaturesOptionsWidget::~KviInputFeaturesOptionsWidget()
+OptionsWidget_inputFeatures::~OptionsWidget_inputFeatures()
 {
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_input.moc"
+#include "m_OptionsWidget_input.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_input.h b/src/modules/options/OptionsWidget_input.h
index 71f65549b..ac92c2952 100644
--- a/src/modules/options/optw_input.h
+++ b/src/modules/options/OptionsWidget_input.h
@@ -3,7 +3,7 @@
 
 //=============================================================================
 //
-//   File : optw_input.h
+//   File : OptionsWidget_input.h
 //   Creation date : Sat Aug 11 2001 04:25:01 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -34,29 +34,29 @@
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviInputLookOptionsWidget __tr2qs_no_lookup("theme,colors,text")
 #define KVI_OPTIONS_WIDGET_GROUP_KviInputLookOptionsWidget "theme"
 
-class KviInputLookOptionsWidget : public KviOptionsWidget
+class OptionsWidget_inputLook : public KviOptionsWidget
 {
 	Q_OBJECT
 private:
 	QComboBox* m_pHorizontalAlign;
 	QComboBox* m_pVerticalAlign;
 public:
-	KviInputLookOptionsWidget(QWidget * parent);
-	~KviInputLookOptionsWidget();
+	OptionsWidget_inputLook(QWidget * parent);
+	~OptionsWidget_inputLook();
 
 	virtual void commit();
 };
 
 #define KVI_OPTIONS_WIDGET_ICON_KviInputFeaturesOptionsWidget KVI_SMALLICON_INPUT
 #define KVI_OPTIONS_WIDGET_NAME_KviInputFeaturesOptionsWidget __tr2qs_no_lookup("Input")
-#define KVI_OPTIONS_WIDGET_PARENT_KviInputFeaturesOptionsWidget KviInterfaceFeaturesOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviInputFeaturesOptionsWidget OptionsWidget_interfaceFeatures
 
-class KviInputFeaturesOptionsWidget : public KviOptionsWidget
+class OptionsWidget_inputFeatures : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviInputFeaturesOptionsWidget(QWidget * parent);
-	~KviInputFeaturesOptionsWidget();
+	OptionsWidget_inputFeatures(QWidget * parent);
+	~OptionsWidget_inputFeatures();
 };
 
 #endif //!_OPTW_INPUT_H_
diff --git a/src/modules/options/optw_interfacefeatures.cpp b/src/modules/options/OptionsWidget_interfaceFeatures.cpp
index e7884c502..ef3f1c2ed 100644
--- a/src/modules/options/optw_interfacefeatures.cpp
+++ b/src/modules/options/OptionsWidget_interfaceFeatures.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_interfacefeatures.cpp
+//   File : OptionsWidget_interfaceFeatures.cpp
 //   Creation date : Sat Jun 2 2001 14:52:53 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "optw_interfacefeatures.h"
+#include "OptionsWidget_interfaceFeatures.h"
 
 #include "KviOptions.h"
 #include "KviLocale.h"
@@ -35,7 +35,7 @@
 #include <string.h>
 
 
-KviInterfaceFeaturesOptionsWidget::KviInterfaceFeaturesOptionsWidget(QWidget * parent)
+OptionsWidget_interfaceFeatures::OptionsWidget_interfaceFeatures(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("interfacefeatures_options_widget");
@@ -64,11 +64,11 @@ KviInterfaceFeaturesOptionsWidget::KviInterfaceFeaturesOptionsWidget(QWidget * p
 	addRowSpacer(0,7,0,7);
 }
 
-KviInterfaceFeaturesOptionsWidget::~KviInterfaceFeaturesOptionsWidget()
+OptionsWidget_interfaceFeatures::~OptionsWidget_interfaceFeatures()
 {
 }
 
-void KviInterfaceFeaturesOptionsWidget::commit()
+void OptionsWidget_interfaceFeatures::commit()
 {
 	KviOptionsWidget::commit();
 
@@ -87,5 +87,5 @@ void KviInterfaceFeaturesOptionsWidget::commit()
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_interfacefeatures.moc"
+#include "m_OptionsWidget_interfaceFeatures.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_interfacefeatures.h b/src/modules/options/OptionsWidget_interfaceFeatures.h
index 5d8ab1293..b4e29ebf3 100644
--- a/src/modules/options/optw_interfacefeatures.h
+++ b/src/modules/options/OptionsWidget_interfaceFeatures.h
@@ -3,7 +3,7 @@
 
 //=============================================================================
 //
-//   File : optw_interfacefeatures.h
+//   File : OptionsWidget_interfaceFeatures.h
 //   Creation date : Sat Jun 2 2001 14:50:01 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -32,12 +32,12 @@
 #define KVI_OPTIONS_WIDGET_NAME_KviInterfaceFeaturesOptionsWidget __tr2qs_no_lookup("Interface")
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviInterfaceFeaturesOptionsWidget 50000
 
-class KviInterfaceFeaturesOptionsWidget : public KviOptionsWidget
+class OptionsWidget_interfaceFeatures : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviInterfaceFeaturesOptionsWidget(QWidget * parent);
-	~KviInterfaceFeaturesOptionsWidget();
+	OptionsWidget_interfaceFeatures(QWidget * parent);
+	~OptionsWidget_interfaceFeatures();
 protected:
 	QCheckBox * m_pDisableSplash;
 public:
diff --git a/src/modules/options/optw_irc.cpp b/src/modules/options/OptionsWidget_irc.cpp
index 342a31181..675eb43db 100644
--- a/src/modules/options/optw_irc.cpp
+++ b/src/modules/options/OptionsWidget_irc.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_irc.cpp
+//   File : OptionsWidget_irc.cpp
 //   Creation date : Sun Dec  2 18:59:48 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "optw_irc.h"
+#include "OptionsWidget_irc.h"
 
 #include "kvi_settings.h"
 #include "KviLocale.h"
@@ -30,18 +30,18 @@
 #include "KviIrcMask.h"
 
 
-KviIrcOptionsWidget::KviIrcOptionsWidget(QWidget * parent)
+OptionsWidget_irc::OptionsWidget_irc(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("irc_options_widget");
 }
 
-KviIrcOptionsWidget::~KviIrcOptionsWidget()
+OptionsWidget_irc::~OptionsWidget_irc()
 {
 }
 
 
-KviIrcGeneralOptionsWidget::KviIrcGeneralOptionsWidget(QWidget * parent)
+OptionsWidget_ircGeneral::OptionsWidget_ircGeneral(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("irc_options_widget");
@@ -56,12 +56,12 @@ KviIrcGeneralOptionsWidget::KviIrcGeneralOptionsWidget(QWidget * parent)
 	addRowSpacer(0,2,0,2);
 }
 
-KviIrcGeneralOptionsWidget::~KviIrcGeneralOptionsWidget()
+OptionsWidget_ircGeneral::~OptionsWidget_ircGeneral()
 {
 }
 
 
-KviIrcAdvancedOptionsWidget::KviIrcAdvancedOptionsWidget(QWidget * parent)
+OptionsWidget_ircAdvanced::OptionsWidget_ircAdvanced(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("irc_advanced_options_widget");
@@ -79,10 +79,10 @@ KviIrcAdvancedOptionsWidget::KviIrcAdvancedOptionsWidget(QWidget * parent)
 	addRowSpacer(0,4,0,4);
 }
 
-KviIrcAdvancedOptionsWidget::~KviIrcAdvancedOptionsWidget()
+OptionsWidget_ircAdvanced::~OptionsWidget_ircAdvanced()
 {
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_irc.moc"
+#include "m_OptionsWidget_irc.moc"
 #endif //COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_irc.h b/src/modules/options/OptionsWidget_irc.h
index 907f8e911..c481265fa 100644
--- a/src/modules/options/optw_irc.h
+++ b/src/modules/options/OptionsWidget_irc.h
@@ -2,7 +2,7 @@
 #define _OPTW_IRC_H_
 //=============================================================================
 //
-//   File : optw_irc.h
+//   File : OptionsWidget_irc.h
 //   Creation date : Sun Dec  2 18:59:49 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -31,39 +31,39 @@
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviIrcOptionsWidget 80000
 #define KVI_OPTIONS_WIDGET_CONTAINER_KviIrcOptionsWidget true
 
-class KviIrcOptionsWidget : public KviOptionsWidget
+class OptionsWidget_irc : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviIrcOptionsWidget(QWidget * parent);
-	~KviIrcOptionsWidget();
+	OptionsWidget_irc(QWidget * parent);
+	~OptionsWidget_irc();
 };
 
 #define KVI_OPTIONS_WIDGET_ICON_KviIrcGeneralOptionsWidget KVI_SMALLICON_IRC
 #define KVI_OPTIONS_WIDGET_NAME_KviIrcGeneralOptionsWidget __tr2qs_no_lookup("General")
-#define KVI_OPTIONS_WIDGET_PARENT_KviIrcGeneralOptionsWidget KviIrcOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviIrcGeneralOptionsWidget OptionsWidget_irc
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviIrcGeneralOptionsWidget 80000
 
-class KviIrcGeneralOptionsWidget : public KviOptionsWidget
+class OptionsWidget_ircGeneral : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviIrcGeneralOptionsWidget(QWidget * parent);
-	~KviIrcGeneralOptionsWidget();
+	OptionsWidget_ircGeneral(QWidget * parent);
+	~OptionsWidget_ircGeneral();
 };
 
 
 #define KVI_OPTIONS_WIDGET_ICON_KviIrcAdvancedOptionsWidget KVI_SMALLICON_IRC
 #define KVI_OPTIONS_WIDGET_NAME_KviIrcAdvancedOptionsWidget __tr2qs_no_lookup("Advanced")
-#define KVI_OPTIONS_WIDGET_PARENT_KviIrcAdvancedOptionsWidget KviIrcOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviIrcAdvancedOptionsWidget OptionsWidget_irc
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviIrcAdvancedOptionsWidget 50000
 
-class KviIrcAdvancedOptionsWidget : public KviOptionsWidget
+class OptionsWidget_ircAdvanced : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviIrcAdvancedOptionsWidget(QWidget * parent);
-	~KviIrcAdvancedOptionsWidget();
+	OptionsWidget_ircAdvanced(QWidget * parent);
+	~OptionsWidget_ircAdvanced();
 };
 
 #endif //_OPTW_IRC_H_
diff --git a/src/modules/options/optw_ircoutput.cpp b/src/modules/options/OptionsWidget_ircOutput.cpp
index a02657cbc..aac001856 100644
--- a/src/modules/options/optw_ircoutput.cpp
+++ b/src/modules/options/OptionsWidget_ircOutput.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_ircoutput.cpp
+//   File : OptionsWidget_ircOutput.cpp
 //   Creation date : Wed Nov 15 2000 11:45:06 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "optw_ircoutput.h"
+#include "OptionsWidget_ircOutput.h"
 
 #include "kvi_settings.h"
 #include "KviOptions.h"
@@ -34,7 +34,7 @@
 #include <QLabel>
 
 
-KviIrcOutputOptionsWidget::KviIrcOutputOptionsWidget(QWidget * pParent)
+OptionsWidget_ircOutput::OptionsWidget_ircOutput(QWidget * pParent)
 : KviOptionsWidget(pParent)
 {
 	setObjectName("ircoutput_options_widget");
@@ -88,11 +88,11 @@ KviIrcOutputOptionsWidget::KviIrcOutputOptionsWidget(QWidget * pParent)
 //	}
 }
 
-KviIrcOutputOptionsWidget::~KviIrcOutputOptionsWidget()
+OptionsWidget_ircOutput::~OptionsWidget_ircOutput()
 {
 }
 
-void KviIrcOutputOptionsWidget::commit()
+void OptionsWidget_ircOutput::commit()
 {
 	KviOptionsWidget::commit();
 
@@ -107,5 +107,5 @@ void KviIrcOutputOptionsWidget::commit()
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_ircoutput.moc"
+#include "m_OptionsWidget_ircOutput.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_ircoutput.h b/src/modules/options/OptionsWidget_ircOutput.h
index b878c709c..55e61ffdd 100644
--- a/src/modules/options/optw_ircoutput.h
+++ b/src/modules/options/OptionsWidget_ircOutput.h
@@ -2,7 +2,7 @@
 #define _OPTW_IRCOUTPUT_H_
 //=============================================================================
 //
-//   File : optw_ircoutput.h
+//   File : OptionsWidget_ircOutput.h
 //   Creation date : Wed Nov 15 2000 11:47:51 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -31,16 +31,16 @@ class QComboBox;
 
 #define KVI_OPTIONS_WIDGET_ICON_KviIrcOutputOptionsWidget KVI_SMALLICON_RAW
 #define KVI_OPTIONS_WIDGET_NAME_KviIrcOutputOptionsWidget __tr2qs_no_lookup("Verbosity And Output")
-#define KVI_OPTIONS_WIDGET_PARENT_KviIrcOutputOptionsWidget KviIrcOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviIrcOutputOptionsWidget OptionsWidget_irc
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviIrcOutputOptionsWidget __tr2qs_no_lookup("debug")
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviIrcOutputOptionsWidget 75000
 
-class KviIrcOutputOptionsWidget : public KviOptionsWidget
+class OptionsWidget_ircOutput : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviIrcOutputOptionsWidget(QWidget * parent);
-	~KviIrcOutputOptionsWidget();
+	OptionsWidget_ircOutput(QWidget * parent);
+	~OptionsWidget_ircOutput();
 protected:
 	QComboBox * m_pVerbosityCombo;
 	QComboBox * m_pDatetimeCombo;
diff --git a/src/modules/options/optw_ircview.cpp b/src/modules/options/OptionsWidget_ircView.cpp
index 34ef1e2e8..ffa514817 100644
--- a/src/modules/options/optw_ircview.cpp
+++ b/src/modules/options/OptionsWidget_ircView.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_ircview.cpp
+//   File : OptionsWidget_ircView.cpp
 //   Creation date : Sat Aug 11 2001 03:29:52 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -23,25 +23,25 @@
 //
 //=============================================================================
 
-#include "optw_ircview.h"
+#include "OptionsWidget_ircView.h"
 
 #include "KviOptions.h"
 #include "KviLocale.h"
 
 #include <QLayout>
 
-KviIrcViewThemeOptionsWidget::KviIrcViewThemeOptionsWidget(QWidget * pParent)
+OptionsWidget_ircViewTheme::OptionsWidget_ircViewTheme(QWidget * pParent)
 : KviOptionsWidget(pParent)
 {
 }
 
-KviIrcViewThemeOptionsWidget::~KviIrcViewThemeOptionsWidget()
+OptionsWidget_ircViewTheme::~OptionsWidget_ircViewTheme()
 {
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-KviIrcViewLookOptionsWidget::KviIrcViewLookOptionsWidget(QWidget * parent)
+OptionsWidget_ircViewLook::OptionsWidget_ircViewLook(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	createLayout();
@@ -104,11 +104,11 @@ KviIrcViewLookOptionsWidget::KviIrcViewLookOptionsWidget(QWidget * parent)
 	layout()->setRowStretch(2,1);
 }
 
-KviIrcViewLookOptionsWidget::~KviIrcViewLookOptionsWidget()
+OptionsWidget_ircViewLook::~OptionsWidget_ircViewLook()
 {
 }
 
-void KviIrcViewLookOptionsWidget::commit()
+void OptionsWidget_ircViewLook::commit()
 {
 	int iFlags=0;
 	switch(m_pHorizontalAlign->currentIndex())
@@ -142,7 +142,7 @@ void KviIrcViewLookOptionsWidget::commit()
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-KviIrcViewFeaturesOptionsWidget::KviIrcViewFeaturesOptionsWidget(QWidget * parent)
+OptionsWidget_ircViewFeatures::OptionsWidget_ircViewFeatures(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	createLayout();
@@ -171,13 +171,13 @@ KviIrcViewFeaturesOptionsWidget::KviIrcViewFeaturesOptionsWidget(QWidget * paren
 	addRowSpacer(0,14,0,14);
 }
 
-KviIrcViewFeaturesOptionsWidget::~KviIrcViewFeaturesOptionsWidget()
+OptionsWidget_ircViewFeatures::~OptionsWidget_ircViewFeatures()
 {
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-KviIrcViewMarkerOptionsWidget::KviIrcViewMarkerOptionsWidget(QWidget * parent)
+OptionsWidget_ircViewMarker::OptionsWidget_ircViewMarker(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	createLayout();
@@ -206,16 +206,16 @@ KviIrcViewMarkerOptionsWidget::KviIrcViewMarkerOptionsWidget(QWidget * parent)
 	m_pMarkerStyle->setCurrentIndex(uStyle < 5 ? uStyle : 0);
 }
 
-KviIrcViewMarkerOptionsWidget::~KviIrcViewMarkerOptionsWidget()
+OptionsWidget_ircViewMarker::~OptionsWidget_ircViewMarker()
 {
 }
 
-void KviIrcViewMarkerOptionsWidget::commit()
+void OptionsWidget_ircViewMarker::commit()
 {
 	KVI_OPTION_UINT(KviOption_uintIrcViewMarkerStyle)=m_pMarkerStyle->currentIndex();
 	KviOptionsWidget::commit();
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_ircview.moc"
+#include "m_OptionsWidget_ircView.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_ircview.h b/src/modules/options/OptionsWidget_ircView.h
index 4fda1ad31..eb6c43cbc 100644
--- a/src/modules/options/optw_ircview.h
+++ b/src/modules/options/OptionsWidget_ircView.h
@@ -3,7 +3,7 @@
 
 //=============================================================================
 //
-//   File : optw_ircview.h
+//   File : OptionsWidget_ircView.h
 //   Creation date : Sat Aug 11 2001 03:28:19 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -38,30 +38,30 @@
 #define KVI_OPTIONS_WIDGET_GROUP_KviIrcViewThemeOptionsWidget "theme"
 #define KVI_OPTIONS_WIDGET_CONTAINER_KviIrcViewThemeOptionsWidget true
 
-class KviIrcViewThemeOptionsWidget : public KviOptionsWidget
+class OptionsWidget_ircViewTheme : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviIrcViewThemeOptionsWidget(QWidget * pParent);
-	~KviIrcViewThemeOptionsWidget();
+	OptionsWidget_ircViewTheme(QWidget * pParent);
+	~OptionsWidget_ircViewTheme();
 };
 
 #define KVI_OPTIONS_WIDGET_ICON_KviIrcViewLookOptionsWidget KVI_SMALLICON_IRCVIEW
 #define KVI_OPTIONS_WIDGET_NAME_KviIrcViewLookOptionsWidget __tr2qs_no_lookup("Look")
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviIrcViewLookOptionsWidget __tr2qs_no_lookup("theme,colors,output")
 #define KVI_OPTIONS_WIDGET_GROUP_KviIrcViewLookOptionsWidget "theme"
-#define KVI_OPTIONS_WIDGET_PARENT_KviIrcViewLookOptionsWidget KviIrcViewThemeOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviIrcViewLookOptionsWidget OptionsWidget_ircViewTheme
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviIrcViewLookOptionsWidget 30
 
-class KviIrcViewLookOptionsWidget : public KviOptionsWidget
+class OptionsWidget_ircViewLook : public KviOptionsWidget
 {
 	Q_OBJECT
 private:
 	QComboBox * m_pHorizontalAlign;
 	QComboBox * m_pVerticalAlign;
 public:
-	KviIrcViewLookOptionsWidget(QWidget * parent);
-	~KviIrcViewLookOptionsWidget();
+	OptionsWidget_ircViewLook(QWidget * parent);
+	~OptionsWidget_ircViewLook();
 public:
 	virtual void commit();
 };
@@ -69,29 +69,29 @@ public:
 #define KVI_OPTIONS_WIDGET_ICON_KviIrcViewFeaturesOptionsWidget KVI_SMALLICON_IRCVIEW
 #define KVI_OPTIONS_WIDGET_NAME_KviIrcViewFeaturesOptionsWidget __tr2qs_no_lookup("Features")
 #define KVI_OPTIONS_WIDGET_GROUP_KviIrcViewFeaturesOptionsWidget "theme"
-#define KVI_OPTIONS_WIDGET_PARENT_KviIrcViewFeaturesOptionsWidget KviIrcViewThemeOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviIrcViewFeaturesOptionsWidget OptionsWidget_ircViewTheme
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviIrcViewFeaturesOptionsWidget 20
 
-class KviIrcViewFeaturesOptionsWidget : public KviOptionsWidget
+class OptionsWidget_ircViewFeatures : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviIrcViewFeaturesOptionsWidget(QWidget * parent);
-	~KviIrcViewFeaturesOptionsWidget();
+	OptionsWidget_ircViewFeatures(QWidget * parent);
+	~OptionsWidget_ircViewFeatures();
 };
 
 #define KVI_OPTIONS_WIDGET_ICON_KviIrcViewMarkerOptionsWidget KVI_SMALLICON_IRCVIEW
 #define KVI_OPTIONS_WIDGET_NAME_KviIrcViewMarkerOptionsWidget __tr2qs_no_lookup("Marker")
 #define KVI_OPTIONS_WIDGET_GROUP_KviIrcViewMarkerOptionsWidget "theme"
-#define KVI_OPTIONS_WIDGET_PARENT_KviIrcViewMarkerOptionsWidget KviIrcViewThemeOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviIrcViewMarkerOptionsWidget OptionsWidget_ircViewTheme
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviIrcViewMarkerOptionsWidget 10
 
-class KviIrcViewMarkerOptionsWidget : public KviOptionsWidget
+class OptionsWidget_ircViewMarker : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviIrcViewMarkerOptionsWidget(QWidget * pParent);
-	~KviIrcViewMarkerOptionsWidget();
+	OptionsWidget_ircViewMarker(QWidget * pParent);
+	~OptionsWidget_ircViewMarker();
 	virtual void commit();
 private:
 	QComboBox * m_pMarkerStyle;
diff --git a/src/modules/options/optw_lag.cpp b/src/modules/options/OptionsWidget_lag.cpp
index fe7dbe617..0e2e763fd 100644
--- a/src/modules/options/optw_lag.cpp
+++ b/src/modules/options/OptionsWidget_lag.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_lag.cpp
+//   File : OptionsWidget_lag.cpp
 //   Creation date : Wed Cct 16 10:45:54 CEST 2002 by Juanjo �lvarez (juanjux@yahoo.es)
 //
 //   This file is part of the KVIrc irc client distribution
@@ -23,7 +23,7 @@
 //
 //=============================================================================
 
-#include "optw_lag.h"
+#include "OptionsWidget_lag.h"
 
 #include "KviOptions.h"
 #include "KviLocale.h"
@@ -32,7 +32,7 @@
 #include <QLayout>
 
 
-KviLagOptionsWidget::KviLagOptionsWidget(QWidget * parent)
+OptionsWidget_lag::OptionsWidget_lag(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("lag_options_widget");
@@ -70,11 +70,11 @@ KviLagOptionsWidget::KviLagOptionsWidget(QWidget * parent)
 
 }
 
-KviLagOptionsWidget::~KviLagOptionsWidget()
+OptionsWidget_lag::~OptionsWidget_lag()
 {
 }
 
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_lag.moc"
+#include "m_OptionsWidget_lag.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_lag.h b/src/modules/options/OptionsWidget_lag.h
index 7577d69c6..88164c54f 100644
--- a/src/modules/options/optw_lag.h
+++ b/src/modules/options/OptionsWidget_lag.h
@@ -2,7 +2,7 @@
 #define _OPTW_LAG_H_
 //=============================================================================
 //
-//   File : optw_lag.h
+//   File : OptionsWidget_lag.h
 //   Creation date : Wed Cct 16 10:45:54 CEST 2002 by Juanjo Álvarez (juanjux@yahoo.es)
 //
 //   This file is part of the KVIrc irc client distribution
@@ -29,15 +29,15 @@
 
 #define KVI_OPTIONS_WIDGET_ICON_KviLagOptionsWidget KVI_SMALLICON_STATS
 #define KVI_OPTIONS_WIDGET_NAME_KviLagOptionsWidget __tr2qs_no_lookup("Lag")
-#define KVI_OPTIONS_WIDGET_PARENT_KviLagOptionsWidget KviToolsOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviLagOptionsWidget OptionsWidget_tools
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviLagOptionsWidget __tr2qs_no_lookup("time,ping")
 
-class KviLagOptionsWidget : public KviOptionsWidget
+class OptionsWidget_lag : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviLagOptionsWidget(QWidget * parent);
-	~KviLagOptionsWidget();
+	OptionsWidget_lag(QWidget * parent);
+	~OptionsWidget_lag();
 };
 
 #endif //_OPTW_LAG_H_
diff --git a/src/modules/options/optw_logging.cpp b/src/modules/options/OptionsWidget_logging.cpp
index 57788bd16..01ae94c14 100644
--- a/src/modules/options/optw_logging.cpp
+++ b/src/modules/options/OptionsWidget_logging.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_logging.cpp
+//   File : OptionsWidget_logging.cpp
 //   Creation date : Mon Oct 29 15:37:16 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "optw_logging.h"
+#include "OptionsWidget_logging.h"
 
 #include "KviOptions.h"
 #include "KviLocale.h"
@@ -30,7 +30,7 @@
 #include <QLayout>
 
 
-KviLoggingOptionsWidget::KviLoggingOptionsWidget(QWidget * parent)
+OptionsWidget_logging::OptionsWidget_logging(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("logging_options_widget");
@@ -59,12 +59,12 @@ KviLoggingOptionsWidget::KviLoggingOptionsWidget(QWidget * parent)
 	addRowSpacer(0,6,0,6);
 }
 
-KviLoggingOptionsWidget::~KviLoggingOptionsWidget()
+OptionsWidget_logging::~OptionsWidget_logging()
 {
 }
 
 
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_logging.moc"
+#include "m_OptionsWidget_logging.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_logging.h b/src/modules/options/OptionsWidget_logging.h
index 22a13bab6..518634b91 100644
--- a/src/modules/options/optw_logging.h
+++ b/src/modules/options/OptionsWidget_logging.h
@@ -2,7 +2,7 @@
 #define _OPTW_LOGGING_H_
 //=============================================================================
 //
-//   File : optw_logging.h
+//   File : OptionsWidget_logging.h
 //   Creation date : Mon Oct 29 15:37:18 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -29,16 +29,16 @@
 #define KVI_OPTIONS_WIDGET_ICON_KviLoggingOptionsWidget KVI_SMALLICON_LOG
 #define KVI_OPTIONS_WIDGET_NAME_KviLoggingOptionsWidget __tr2qs_no_lookup("Logging")
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviLoggingOptionsWidget __tr2qs_no_lookup("save,output")
-#define KVI_OPTIONS_WIDGET_PARENT_KviLoggingOptionsWidget KviToolsOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviLoggingOptionsWidget OptionsWidget_tools
 
-//noway #define KVI_OPTIONS_WIDGET_NO_PARENT_KviLoggingOptionsWidget KviIrcOptionsWidget
+//noway #define KVI_OPTIONS_WIDGET_NO_PARENT_KviLoggingOptionsWidget OptionsWidget_irc
 
-class KviLoggingOptionsWidget : public KviOptionsWidget
+class OptionsWidget_logging : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviLoggingOptionsWidget(QWidget * parent);
-	~KviLoggingOptionsWidget();
+	OptionsWidget_logging(QWidget * parent);
+	~OptionsWidget_logging();
 };
 
 #endif //_OPTW_LOGGING_H_
diff --git a/src/modules/options/optw_mediatypes.cpp b/src/modules/options/OptionsWidget_mediaTypes.cpp
index afe5fa4b6..71df63df1 100644
--- a/src/modules/options/optw_mediatypes.cpp
+++ b/src/modules/options/OptionsWidget_mediaTypes.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_mediatypes.cpp
+//   File : OptionsWidget_mediaTypes.cpp
 //   Creation date : Sat Jan 20 2001 16:14:53 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "optw_mediatypes.h"
+#include "OptionsWidget_mediaTypes.h"
 
 #include "KviOptions.h"
 #include "KviLocale.h"
@@ -46,17 +46,17 @@ static void copyMediaType(KviMediaType * dst,const KviMediaType * src)
 	dst->szIcon                  = src->szIcon;
 }
 
-KviMediaTypeTreeWidgetItem::KviMediaTypeTreeWidgetItem(QTreeWidget * w,KviMediaType * t)
+MediaTypeTreeWidgetItem::MediaTypeTreeWidgetItem(QTreeWidget * w,KviMediaType * t)
 : QTreeWidgetItem(w)
 {
 	copyData(t);
 }
 
-KviMediaTypeTreeWidgetItem::~KviMediaTypeTreeWidgetItem()
+MediaTypeTreeWidgetItem::~MediaTypeTreeWidgetItem()
 {
 }
 
-void KviMediaTypeTreeWidgetItem::copyData(KviMediaType * t)
+void MediaTypeTreeWidgetItem::copyData(KviMediaType * t)
 {
 	copyMediaType(&m_data,t);
 	setText(0,m_data.szFileMask.ptr());
@@ -64,7 +64,7 @@ void KviMediaTypeTreeWidgetItem::copyData(KviMediaType * t)
 	setText(2,m_data.szDescription.ptr());
 }
 
-KviMediaTypesOptionsWidget::KviMediaTypesOptionsWidget(QWidget * parent)
+OptionsWidget_mediaTypes::OptionsWidget_mediaTypes(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("mediatypes_options_widget");
@@ -149,24 +149,24 @@ KviMediaTypesOptionsWidget::KviMediaTypesOptionsWidget(QWidget * parent)
 	fillTreeWidget();
 }
 
-KviMediaTypesOptionsWidget::~KviMediaTypesOptionsWidget()
+OptionsWidget_mediaTypes::~OptionsWidget_mediaTypes()
 {
 }
 
-void KviMediaTypesOptionsWidget::fillTreeWidget()
+void OptionsWidget_mediaTypes::fillTreeWidget()
 {
 	m_pTreeWidget->clear();
 	g_pMediaManager->lock();
 	KviPointerList<KviMediaType> * l = g_pMediaManager->mediaTypeList();
 
 	for(KviMediaType * t = l->first();t;t = l->next())
-		new KviMediaTypeTreeWidgetItem(m_pTreeWidget,t);
+		new MediaTypeTreeWidgetItem(m_pTreeWidget,t);
 
 	g_pMediaManager->unlock();
 	enableOrDisable();
 }
 
-void KviMediaTypesOptionsWidget::saveLastItem()
+void OptionsWidget_mediaTypes::saveLastItem()
 {
 	if(m_pLastItem)
 	{
@@ -186,7 +186,7 @@ void KviMediaTypesOptionsWidget::saveLastItem()
 	}
 }
 
-void KviMediaTypesOptionsWidget::enableOrDisable()
+void OptionsWidget_mediaTypes::enableOrDisable()
 {
 	m_pDescription->setEnabled(m_pLastItem);
 	m_pIanaType->setEnabled(m_pLastItem);
@@ -199,7 +199,7 @@ void KviMediaTypesOptionsWidget::enableOrDisable()
 	m_pIcon->setEnabled(m_pLastItem);
 }
 
-void KviMediaTypesOptionsWidget::setLineEdits()
+void OptionsWidget_mediaTypes::setLineEdits()
 {
 	m_pDescription->setText(m_pLastItem ? m_pLastItem->mydata()->szDescription.ptr() : "");
 	m_pIanaType->setText(m_pLastItem ? m_pLastItem->mydata()->szIanaType.ptr() : "");
@@ -211,10 +211,10 @@ void KviMediaTypesOptionsWidget::setLineEdits()
 	m_pIcon->setText(m_pLastItem ? m_pLastItem->mydata()->szIcon.ptr() : "");
 }
 
-void KviMediaTypesOptionsWidget::currentItemChanged(QTreeWidgetItem *it,QTreeWidgetItem *)
+void OptionsWidget_mediaTypes::currentItemChanged(QTreeWidgetItem *it,QTreeWidgetItem *)
 {
 	saveLastItem();
-	m_pLastItem = (KviMediaTypeTreeWidgetItem *)it;
+	m_pLastItem = (MediaTypeTreeWidgetItem *)it;
 	if(it)
 	{
 		if(!it->isSelected())it->setSelected(true);
@@ -223,43 +223,43 @@ void KviMediaTypesOptionsWidget::currentItemChanged(QTreeWidgetItem *it,QTreeWid
 	enableOrDisable();
 }
 
-void KviMediaTypesOptionsWidget::newMediaType()
+void OptionsWidget_mediaTypes::newMediaType()
 {
 	KviMediaType empty;
 	empty.szDescription = __tr2qs_ctx("New Media Type","options");
-	KviMediaTypeTreeWidgetItem * it = new KviMediaTypeTreeWidgetItem(m_pTreeWidget,&empty);
+	MediaTypeTreeWidgetItem * it = new MediaTypeTreeWidgetItem(m_pTreeWidget,&empty);
 	m_pTreeWidget->setCurrentItem(it);
 	it->setSelected(true);
 }
 
-void KviMediaTypesOptionsWidget::delMediaType()
+void OptionsWidget_mediaTypes::delMediaType()
 {
 	if(m_pLastItem)
 	{
-		KviMediaTypeTreeWidgetItem * it = m_pLastItem;
+		MediaTypeTreeWidgetItem * it = m_pLastItem;
 		m_pLastItem = 0;
 		delete it;
 	}
 }
 
-void KviMediaTypesOptionsWidget::commit()
+void OptionsWidget_mediaTypes::commit()
 {
 	saveLastItem();
-	KviMediaTypeTreeWidgetItem * it;// = (KviMediaTypeTreeWidgetItem *)m_pTreeWidget->firstChild();
+	MediaTypeTreeWidgetItem * it;// = (MediaTypeTreeWidgetItem *)m_pTreeWidget->firstChild();
 	g_pMediaManager->lock();
 	g_pMediaManager->clear();
 	//while(it)
 	for(int i=0;i<m_pTreeWidget->topLevelItemCount();i++)
 	{
-		it=(KviMediaTypeTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
+		it=(MediaTypeTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
 		KviMediaType * t = new KviMediaType;
 		copyMediaType(t,it->mydata());
 		g_pMediaManager->insertMediaType(t);
-	//	it = (KviMediaTypeTreeWidgetItem *)it->nextSibling();
+	//	it = (MediaTypeTreeWidgetItem *)it->nextSibling();
 	}
 	g_pMediaManager->unlock();
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_mediatypes.moc"
+#include "m_OptionsWidget_mediaTypes.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_mediatypes.h b/src/modules/options/OptionsWidget_mediaTypes.h
index 08a96fabd..46e2bee20 100644
--- a/src/modules/options/optw_mediatypes.h
+++ b/src/modules/options/OptionsWidget_mediaTypes.h
@@ -2,7 +2,7 @@
 #define _OPTW_MEDIATYPES_H_
 //=============================================================================
 //
-//   File : optw_mediatypes.h
+//   File : OptionsWidget_mediaTypes.h
 //   Creation date : Sat Jan 20 2001 16:12:10 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -32,11 +32,11 @@
 #include <QPushButton>
 
 
-class KviMediaTypeTreeWidgetItem : public QTreeWidgetItem
+class MediaTypeTreeWidgetItem : public QTreeWidgetItem
 {
 public:
-	KviMediaTypeTreeWidgetItem(QTreeWidget * w,KviMediaType * t);
-	~KviMediaTypeTreeWidgetItem();
+	MediaTypeTreeWidgetItem(QTreeWidget * w,KviMediaType * t);
+	~MediaTypeTreeWidgetItem();
 private:
 	KviMediaType m_data;
 public:
@@ -46,17 +46,17 @@ public:
 
 #define KVI_OPTIONS_WIDGET_ICON_KviMediaTypesOptionsWidget KVI_SMALLICON_FILE
 #define KVI_OPTIONS_WIDGET_NAME_KviMediaTypesOptionsWidget __tr2qs_no_lookup("Media Types")
-#define KVI_OPTIONS_WIDGET_PARENT_KviMediaTypesOptionsWidget KviGeneralOptOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviMediaTypesOptionsWidget OptionsWidget_general
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviMediaTypesOptionsWidget __tr2qs_no_lookup("file,audio,video,programs")
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviMediaTypesOptionsWidget 60000
 //#define KVI_OPTIONS_WIDGET_HIDDEN_KviMediaTypesOptionsWidget true
 
-class KviMediaTypesOptionsWidget : public KviOptionsWidget
+class OptionsWidget_mediaTypes : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviMediaTypesOptionsWidget(QWidget * parent);
-	~KviMediaTypesOptionsWidget();
+	OptionsWidget_mediaTypes(QWidget * parent);
+	~OptionsWidget_mediaTypes();
 private:
 	QTreeWidget  * m_pTreeWidget;
 	QLineEdit   * m_pDescription;
@@ -68,7 +68,7 @@ private:
 	QLineEdit   * m_pRemoteExecCommandline;
 	QLineEdit   * m_pIcon;
 	QPushButton * m_pDelete;
-	KviMediaTypeTreeWidgetItem * m_pLastItem;
+	MediaTypeTreeWidgetItem * m_pLastItem;
 private:
 	void fillTreeWidget();
 	void saveLastItem();
diff --git a/src/modules/options/optw_messages.cpp b/src/modules/options/OptionsWidget_message.cpp
index 576bde517..6dd563142 100644
--- a/src/modules/options/optw_messages.cpp
+++ b/src/modules/options/OptionsWidget_message.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_messages.cpp
+//   File : OptionsWidget_message.cpp
 //   Creation date : Sat Aug 11 2001 18:12:00 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -24,7 +24,7 @@
 
 #define _WANT_OPTION_FLAGS_
 
-#include "optw_messages.h"
+#include "OptionsWidget_message.h"
 
 #include "kvi_settings.h"
 #include "KviOptions.h"
@@ -51,18 +51,18 @@
 #endif
 
 
-KviMessageOptionsWidget::KviMessageOptionsWidget(QWidget * pParent)
+OptionsWidget_message::OptionsWidget_message(QWidget * pParent)
 : KviOptionsWidget(pParent)
 {
 }
 
-KviMessageOptionsWidget::~KviMessageOptionsWidget()
+OptionsWidget_message::~OptionsWidget_message()
 {
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-KviPrivmsgOptionsWidget::KviPrivmsgOptionsWidget(QWidget * parent)
+OptionsWidget_privmsg::OptionsWidget_privmsg(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("privmsg_options_widget");
@@ -119,16 +119,16 @@ KviPrivmsgOptionsWidget::KviPrivmsgOptionsWidget(QWidget * parent)
 	addRowSpacer(0,3,0,3);
 }
 
-void KviPrivmsgOptionsWidget::enableDisableSmartColorSelector(bool)
+void OptionsWidget_privmsg::enableDisableSmartColorSelector(bool)
 {
 	m_pSmartColorSelector->setEnabled(m_pUseSmartColorSelector->isChecked() && m_pUseSmartColorSelector->isChecked());
 }
 
-KviPrivmsgOptionsWidget::~KviPrivmsgOptionsWidget()
+OptionsWidget_privmsg::~OptionsWidget_privmsg()
 {
 }
 
-KviTimestampOptionsWidget::KviTimestampOptionsWidget(QWidget * pParent)
+OptionsWidget_timestamp::OptionsWidget_timestamp(QWidget * pParent)
 : KviOptionsWidget(pParent)
 {
 	createLayout();
@@ -155,18 +155,18 @@ KviTimestampOptionsWidget::KviTimestampOptionsWidget(QWidget * pParent)
 	addRowSpacer(0,4,0,4);
 }
 
-KviTimestampOptionsWidget::~KviTimestampOptionsWidget()
+OptionsWidget_timestamp::~OptionsWidget_timestamp()
 {
 }
 
-void KviTimestampOptionsWidget::enableDisableTimestampSelector(bool)
+void OptionsWidget_timestamp::enableDisableTimestampSelector(bool)
 {
 	m_pTimestampColorSelector->setEnabled(m_pUseTimestampSelector->isChecked() && m_pSpecialTimestampColorSelector->isChecked());
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-KviStandardColorsOptionsWidget::KviStandardColorsOptionsWidget(QWidget * parent)
+OptionsWidget_standardColors::OptionsWidget_standardColors(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("stdcolors");
@@ -194,11 +194,11 @@ KviStandardColorsOptionsWidget::KviStandardColorsOptionsWidget(QWidget * parent)
 	layout()->setRowStretch(4,1);
 }
 
-KviStandardColorsOptionsWidget::~KviStandardColorsOptionsWidget()
+OptionsWidget_standardColors::~OptionsWidget_standardColors()
 {
 }
 
-KviMessageListWidgetItem::KviMessageListWidgetItem(KviMessageListWidget* l,int optId)
+MessageListWidgetItem::MessageListWidgetItem(MessageListWidget* l,int optId)
 : KviTalListWidgetItem(l)
 {
 	m_iOptId = optId;
@@ -215,16 +215,16 @@ KviMessageListWidgetItem::KviMessageListWidgetItem(KviMessageListWidget* l,int o
 	setIcon(*(g_pIconManager->getSmallIcon(m_pMsgType->pixId())));
 }
 
-KviMessageListWidgetItem::~KviMessageListWidgetItem()
+MessageListWidgetItem::~MessageListWidgetItem()
 {
 	delete m_pMsgType;
 }
 
-void KviMessageListWidgetItemDelegate::paint(QPainter * p, const QStyleOptionViewItem & opt, const QModelIndex & index) const
+void MessageListWidgetItemDelegate::paint(QPainter * p, const QStyleOptionViewItem & opt, const QModelIndex & index) const
 {
 
 	const KviTalListWidget *tb = (const KviTalListWidget *)parent();
-	KviMessageListWidgetItem *it = static_cast<KviMessageListWidgetItem*>(index.internalPointer());
+	MessageListWidgetItem *it = static_cast<MessageListWidgetItem*>(index.internalPointer());
 #ifdef COMPILE_PSEUDO_TRANSPARENCY
 	if(KVI_OPTION_BOOL(KviOption_boolUseCompositingForTransparency) && g_pApp->supportsCompositing())
 	{
@@ -287,7 +287,7 @@ void KviMessageListWidgetItemDelegate::paint(QPainter * p, const QStyleOptionVie
 }
 
 
-KviMessageColorListWidgetItem::KviMessageColorListWidgetItem(KviTalListWidget * b,int idx)
+MessageColorListWidgetItem::MessageColorListWidgetItem(KviTalListWidget * b,int idx)
 : KviTalListWidgetText(b,QString())
 {
 
@@ -302,18 +302,18 @@ KviMessageColorListWidgetItem::KviMessageColorListWidgetItem(KviTalListWidget *
 	}
 }
 
-KviMessageColorListWidgetItem::~KviMessageColorListWidgetItem()
+MessageColorListWidgetItem::~MessageColorListWidgetItem()
 {
 }
 
-void KviMessageColorListWidgetItemDelegate::paint(QPainter * p, const QStyleOptionViewItem & opt, const QModelIndex & index) const
+void MessageColorListWidgetItemDelegate::paint(QPainter * p, const QStyleOptionViewItem & opt, const QModelIndex & index) const
 {
 
 	if(opt.state & QStyle::State_Selected)
 	{
 		QColor clr;
 		const KviTalListWidget *lb = (const KviTalListWidget *)parent();
-		KviMessageColorListWidgetItem *it = static_cast<KviMessageColorListWidgetItem*>(index.internalPointer());
+		MessageColorListWidgetItem *it = static_cast<MessageColorListWidgetItem*>(index.internalPointer());
 
 		if((it->clrIdx() >= 0) && (it->clrIdx() <= 15))
 		{
@@ -337,7 +337,7 @@ void KviMessageColorListWidgetItemDelegate::paint(QPainter * p, const QStyleOpti
 	}
 }
 
-KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(QWidget * parent)
+OptionsWidget_messageColors::OptionsWidget_messageColors(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("messages");
@@ -347,8 +347,8 @@ KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(QWidget * parent)
 	int i;
 	m_pLastItem = 0;
 
-	m_pListView = new KviMessageListWidget(this);
-	m_pListViewItemDelegate = new KviMessageListWidgetItemDelegate(m_pListView);
+	m_pListView = new MessageListWidget(this);
+	m_pListViewItemDelegate = new MessageListWidgetItemDelegate(m_pListView);
 	m_pListView->setItemDelegate(m_pListViewItemDelegate);
 	m_pListView->setSelectionMode(QAbstractItemView::SingleSelection);
 	m_pListView->setFont(KVI_OPTION_FONT(KviOption_fontIrcView));
@@ -363,25 +363,25 @@ KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(QWidget * parent)
 
 	m_pBackListWidget = new KviTalListWidget(box);
 	m_pBackListWidget->setMaximumWidth(150);
-	m_pBackListWidgetDelegate = new KviMessageColorListWidgetItemDelegate(m_pBackListWidget);
+	m_pBackListWidgetDelegate = new MessageColorListWidgetItemDelegate(m_pBackListWidget);
 	m_pBackListWidget->setItemDelegate(m_pBackListWidgetDelegate);
 
-	m_pBackItems[16] = new KviMessageColorListWidgetItem(m_pBackListWidget,KviMircCntrl::Transparent);
+	m_pBackItems[16] = new MessageColorListWidgetItem(m_pBackListWidget,KviMircCntrl::Transparent);
 	for(i=0;i<16;i++)
 	{
-		m_pBackItems[i] = new KviMessageColorListWidgetItem(m_pBackListWidget,i);
+		m_pBackItems[i] = new MessageColorListWidgetItem(m_pBackListWidget,i);
 	}
 
 	new QLabel(__tr2qs_ctx("Foreground:","options"),box);
 
 	m_pForeListWidget = new KviTalListWidget(box);
 	m_pForeListWidget->setMaximumWidth(150);
-	m_pForeListWidgetDelegate = new KviMessageColorListWidgetItemDelegate(m_pForeListWidget);
+	m_pForeListWidgetDelegate = new MessageColorListWidgetItemDelegate(m_pForeListWidget);
 	m_pForeListWidget->setItemDelegate(m_pForeListWidgetDelegate);
 
 	for(i=0;i<16;i++)
 	{
-		m_pForeItems[i] = new KviMessageColorListWidgetItem(m_pForeListWidget,i);
+		m_pForeItems[i] = new MessageColorListWidgetItem(m_pForeListWidget,i);
 	}
 
 	new QLabel(__tr2qs_ctx("Alert level:","options"),box);
@@ -416,7 +416,7 @@ KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(QWidget * parent)
 
 
 	for(i=0;i<KVI_NUM_MSGTYPE_OPTIONS;i++)
-		new KviMessageListWidgetItem(m_pListView,i);
+		new MessageListWidgetItem(m_pListView,i);
 
 	layout()->setRowStretch(0,1);
 	layout()->setColumnStretch(0,1);
@@ -428,7 +428,7 @@ KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(QWidget * parent)
 	itemChanged();
 }
 
-KviMessageColorsOptionsWidget::~KviMessageColorsOptionsWidget()
+OptionsWidget_messageColors::~OptionsWidget_messageColors()
 {
 	int i;
 	for(i=15;i>=0;i--)
@@ -449,7 +449,7 @@ KviMessageColorsOptionsWidget::~KviMessageColorsOptionsWidget()
 	delete m_pIconPopup;
 }
 
-void KviMessageColorsOptionsWidget::newIconSelected(int iconId)
+void OptionsWidget_messageColors::newIconSelected(int iconId)
 {
 	if(!m_pLastItem)return;
 	if(iconId >= KVI_NUM_SMALL_ICONS)return;
@@ -458,7 +458,7 @@ void KviMessageColorsOptionsWidget::newIconSelected(int iconId)
 	m_pListView->repaint(m_pListView->visualItemRect(m_pLastItem));
 }
 
-void KviMessageColorsOptionsWidget::saveLastItem()
+void OptionsWidget_messageColors::saveLastItem()
 {
 	if(!m_pLastItem)return;
 
@@ -466,14 +466,14 @@ void KviMessageColorsOptionsWidget::saveLastItem()
 	if(curIt >= 0) //quite useless
 	{
 		//qDebug("Setting fore %d",curIt);
-		KviMessageColorListWidgetItem * fore = (KviMessageColorListWidgetItem *)m_pForeListWidget->item(curIt);
+		MessageColorListWidgetItem * fore = (MessageColorListWidgetItem *)m_pForeListWidget->item(curIt);
 		//qDebug("And is %d",fore);
 		if(fore)m_pLastItem->msgType()->setFore(fore->m_iClrIdx);
 	}
 	curIt = m_pBackListWidget->currentRow();
 	if(curIt >= 0) //quite useless
 	{
-		KviMessageColorListWidgetItem * back = (KviMessageColorListWidgetItem *)m_pBackListWidget->item(curIt);
+		MessageColorListWidgetItem * back = (MessageColorListWidgetItem *)m_pBackListWidget->item(curIt);
 		if(back)m_pLastItem->msgType()->setBack(back->m_iClrIdx);
 	}
 	m_pLastItem->msgType()->enableLogging(m_pEnableLogging->isChecked());
@@ -484,7 +484,7 @@ void KviMessageColorsOptionsWidget::saveLastItem()
 	m_pListView->repaint(m_pListView->visualItemRect(m_pLastItem));
 }
 
-void KviMessageColorsOptionsWidget::itemChanged()
+void OptionsWidget_messageColors::itemChanged()
 {
 	KviTalListWidgetItem * it = (KviTalListWidgetItem*)m_pListView->currentItem();
 	//qDebug("Item changed","options");
@@ -500,8 +500,8 @@ void KviMessageColorsOptionsWidget::itemChanged()
 
 	if(it)
 	{
-		int back = ((KviMessageListWidgetItem *)it)->msgType()->back();
-		int fore = ((KviMessageListWidgetItem *)it)->msgType()->fore();
+		int back = ((MessageListWidgetItem *)it)->msgType()->back();
+		int fore = ((MessageListWidgetItem *)it)->msgType()->fore();
 		if(fore >= 0 && fore <= 15)
 		{
 			m_pForeListWidget->setCurrentItem(m_pForeItems[fore]);
@@ -512,26 +512,26 @@ void KviMessageColorsOptionsWidget::itemChanged()
 		} else {
 			m_pBackListWidget->setCurrentItem(m_pBackItems[16]);
 		}
-		m_pLevelListWidget->setCurrentRow(((KviMessageListWidgetItem *)it)->msgType()->level());
-		m_pEnableLogging->setChecked(((KviMessageListWidgetItem *)it)->msgType()->logEnabled());
-		m_pIconButton->setIcon(*(g_pIconManager->getSmallIcon(((KviMessageListWidgetItem *)it)->msgType()->pixId())));
+		m_pLevelListWidget->setCurrentRow(((MessageListWidgetItem *)it)->msgType()->level());
+		m_pEnableLogging->setChecked(((MessageListWidgetItem *)it)->msgType()->logEnabled());
+		m_pIconButton->setIcon(*(g_pIconManager->getSmallIcon(((MessageListWidgetItem *)it)->msgType()->pixId())));
 	}
 
 	// Ok...can save from now on
-	m_pLastItem = (KviMessageListWidgetItem *)it;
+	m_pLastItem = (MessageListWidgetItem *)it;
 }
 
-void KviMessageColorsOptionsWidget::colorChanged()
+void OptionsWidget_messageColors::colorChanged()
 {
 	if(m_pLastItem)saveLastItem();
 }
 
-void KviMessageColorsOptionsWidget::iconButtonClicked()
+void OptionsWidget_messageColors::iconButtonClicked()
 {
 	m_pIconPopup->popup(QCursor::pos());
 }
 
-void KviMessageColorsOptionsWidget::commit()
+void OptionsWidget_messageColors::commit()
 {
 	saveLastItem();
 
@@ -540,14 +540,14 @@ void KviMessageColorsOptionsWidget::commit()
 	int count = m_pListView->count();
 	for(int i=0; i<count;i++)
 	{
-		KviMessageListWidgetItem* it = (KviMessageListWidgetItem *)m_pListView->item(i);
+		MessageListWidgetItem* it = (MessageListWidgetItem *)m_pListView->item(i);
 		KVI_OPTION_MSGTYPE(it->optionId()) = *(it->msgType());
 	}
 
 	KviOptionsWidget::commit();
 }
 
-void KviMessageColorsOptionsWidget::save()
+void OptionsWidget_messageColors::save()
 {
 	QString szName;
 	QString szInit;
@@ -567,7 +567,7 @@ void KviMessageColorsOptionsWidget::save()
 		int count = m_pListView->count();
 		for(int i=0; i<count;i++)
 		{
-			KviMessageListWidgetItem* it = (KviMessageListWidgetItem *)m_pListView->item(i);
+			MessageListWidgetItem* it = (MessageListWidgetItem *)m_pListView->item(i);
 
 			tmp.sprintf("Fore%d",it->optionId());
 			cfg.writeEntry(tmp.ptr(),it->msgType()->fore());
@@ -586,7 +586,7 @@ void KviMessageColorsOptionsWidget::save()
 
 //#include <errno.h>
 
-void KviMessageColorsOptionsWidget::load()
+void OptionsWidget_messageColors::load()
 {
 
 	QString szName;
@@ -621,7 +621,7 @@ void KviMessageColorsOptionsWidget::load()
 		int count = m_pListView->count();
 		for(int i=0; i<count;i++)
 		{
-			KviMessageListWidgetItem* it = (KviMessageListWidgetItem *)m_pListView->item(i);
+			MessageListWidgetItem* it = (MessageListWidgetItem *)m_pListView->item(i);
 
 			tmp.sprintf("Fore%d",it->optionId());
 			int fore = cfg.readIntEntry(tmp,it->msgType()->fore());
@@ -652,5 +652,5 @@ void KviMessageColorsOptionsWidget::load()
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_messages.moc"
+#include "m_OptionsWidget_message.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_messages.h b/src/modules/options/OptionsWidget_message.h
index da6923f66..d62541901 100644
--- a/src/modules/options/optw_messages.h
+++ b/src/modules/options/OptionsWidget_message.h
@@ -2,7 +2,7 @@
 #define _OPTW_MESSAGES_H_
 //=============================================================================
 //
-//   File : optw_messages.h
+//   File : OptionsWidget_message.h
 //   Creation date : Sat Aug 11 2001 18:11:21 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -41,28 +41,28 @@
 #define KVI_OPTIONS_WIDGET_GROUP_KviMessageOptionsWidget "theme"
 #define KVI_OPTIONS_WIDGET_CONTAINER_KviMessageOptionsWidget true
 
-class KviMessageOptionsWidget : public KviOptionsWidget
+class OptionsWidget_message : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviMessageOptionsWidget(QWidget * pParent);
-	~KviMessageOptionsWidget();
+	OptionsWidget_message(QWidget * pParent);
+	~OptionsWidget_message();
 };
 
 
 #define KVI_OPTIONS_WIDGET_ICON_KviPrivmsgOptionsWidget KVI_SMALLICON_RAW
 #define KVI_OPTIONS_WIDGET_NAME_KviPrivmsgOptionsWidget __tr2qs_no_lookup("Message Style")
-#define KVI_OPTIONS_WIDGET_PARENT_KviPrivmsgOptionsWidget KviMessageOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviPrivmsgOptionsWidget OptionsWidget_message
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviPrivmsgOptionsWidget 40
 #define KVI_OPTIONS_WIDGET_GROUP_KviPrivmsgOptionsWidget "theme"
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviPrivmsgOptionsWidget __tr2qs_no_lookup("theme,privmsg,output,format")
 
-class KviPrivmsgOptionsWidget : public KviOptionsWidget
+class OptionsWidget_privmsg : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviPrivmsgOptionsWidget(QWidget * parent);
-	~KviPrivmsgOptionsWidget();
+	OptionsWidget_privmsg(QWidget * parent);
+	~OptionsWidget_privmsg();
 public:
 	KviBoolSelector * m_pUseSmartColorSelector;
 	KviBoolSelector * m_pSpecialSmartColorSelector;
@@ -73,17 +73,17 @@ protected slots:
 
 #define KVI_OPTIONS_WIDGET_ICON_KviTimestampOptionsWidget KVI_SMALLICON_TIME
 #define KVI_OPTIONS_WIDGET_NAME_KviTimestampOptionsWidget __tr2qs_no_lookup("Timestamp")
-#define KVI_OPTIONS_WIDGET_PARENT_KviTimestampOptionsWidget KviMessageOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviTimestampOptionsWidget OptionsWidget_message
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviTimestampOptionsWidget 20
 #define KVI_OPTIONS_WIDGET_GROUP_KviTimestampOptionsWidget "theme"
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviTimestampOptionsWidget __tr2qs_no_lookup("time,timestamp")
 
-class KviTimestampOptionsWidget : public KviOptionsWidget
+class OptionsWidget_timestamp : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviTimestampOptionsWidget(QWidget * parent);
-	~KviTimestampOptionsWidget();
+	OptionsWidget_timestamp(QWidget * parent);
+	~OptionsWidget_timestamp();
 public:
 	KviBoolSelector * m_pUseTimestampSelector;
 	KviBoolSelector * m_pSpecialTimestampColorSelector;
@@ -96,32 +96,32 @@ protected slots:
 #define KVI_OPTIONS_WIDGET_NAME_KviMessageColorsOptionsWidget __tr2qs_no_lookup("Message Colors")
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviMessageColorsOptionsWidget __tr2qs_no_lookup("theme,colors,messages,output")
 #define KVI_OPTIONS_WIDGET_GROUP_KviMessageColorsOptionsWidget "theme"
-#define KVI_OPTIONS_WIDGET_PARENT_KviMessageColorsOptionsWidget KviMessageOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviMessageColorsOptionsWidget OptionsWidget_message
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviMessageColorsOptionsWidget 30
 
-class KviMessageListWidget : public KviTalListWidget
+class MessageListWidget : public KviTalListWidget
 {
 	Q_OBJECT
 public:
-	KviMessageListWidget(QWidget * par): KviTalListWidget(par) {};
-	~KviMessageListWidget() {};
+	MessageListWidget(QWidget * par): KviTalListWidget(par) {};
+	~MessageListWidget() {};
 };
 
-class  KviMessageListWidgetItemDelegate : public QItemDelegate
+class  MessageListWidgetItemDelegate : public QItemDelegate
 {
 	Q_OBJECT
 public:
-	KviMessageListWidgetItemDelegate(QAbstractItemView * pWidget=0)
+	MessageListWidgetItemDelegate(QAbstractItemView * pWidget=0)
 		: QItemDelegate(pWidget) {};
-	~KviMessageListWidgetItemDelegate(){};
+	~MessageListWidgetItemDelegate(){};
 	void paint(QPainter * p, const QStyleOptionViewItem & opt, const QModelIndex & index) const;
 };
 
-class KviMessageListWidgetItem : public KviTalListWidgetItem
+class MessageListWidgetItem : public KviTalListWidgetItem
 {
 public:
-	KviMessageListWidgetItem(KviMessageListWidget* l,int optId);
-	~KviMessageListWidgetItem();
+	MessageListWidgetItem(MessageListWidget* l,int optId);
+	~MessageListWidgetItem();
 private:
 	int          m_iOptId;
 	KviMessageTypeSettings * m_pMsgType;
@@ -131,45 +131,45 @@ public:
 };
 
 
-class KviMessageColorListWidgetItem : public KviTalListWidgetText
+class MessageColorListWidgetItem : public KviTalListWidgetText
 {
 public:
-	KviMessageColorListWidgetItem(KviTalListWidget * b, int idx);
-	~KviMessageColorListWidgetItem();
+	MessageColorListWidgetItem(KviTalListWidget * b, int idx);
+	~MessageColorListWidgetItem();
 public:
 	int m_iClrIdx;
 public:
 	inline int clrIdx() { return m_iClrIdx; };
 };
 
-class  KviMessageColorListWidgetItemDelegate : public QItemDelegate
+class  MessageColorListWidgetItemDelegate : public QItemDelegate
 {
 	Q_OBJECT
 public:
-	KviMessageColorListWidgetItemDelegate(QAbstractItemView * pWidget=0)
+	MessageColorListWidgetItemDelegate(QAbstractItemView * pWidget=0)
 		: QItemDelegate(pWidget) {};
-	~KviMessageColorListWidgetItemDelegate(){};
+	~MessageColorListWidgetItemDelegate(){};
 	void paint(QPainter * p, const QStyleOptionViewItem & opt, const QModelIndex & index) const;
 };
 
-class KviMessageColorsOptionsWidget : public KviOptionsWidget
+class OptionsWidget_messageColors : public KviOptionsWidget
 {
 	Q_OBJECT
 	friend class KviTalListWidget;
 public:
-	KviMessageColorsOptionsWidget(QWidget * parent);
-	~KviMessageColorsOptionsWidget();
+	OptionsWidget_messageColors(QWidget * parent);
+	~OptionsWidget_messageColors();
 public:
-	KviMessageListWidget         * m_pListView;
-	KviMessageListWidgetItemDelegate * m_pListViewItemDelegate;
+	MessageListWidget         * m_pListView;
+	MessageListWidgetItemDelegate * m_pListViewItemDelegate;
 	KviTalListWidget           * m_pForeListWidget;
-	KviMessageColorListWidgetItemDelegate * m_pForeListWidgetDelegate;
+	MessageColorListWidgetItemDelegate * m_pForeListWidgetDelegate;
 	KviTalListWidget           * m_pBackListWidget;
-	KviMessageColorListWidgetItemDelegate * m_pBackListWidgetDelegate;
+	MessageColorListWidgetItemDelegate * m_pBackListWidgetDelegate;
 	KviTalListWidget           * m_pLevelListWidget;
-	KviMessageColorListWidgetItem * m_pForeItems[16];
-	KviMessageColorListWidgetItem * m_pBackItems[17];
-	KviMessageListWidgetItem     * m_pLastItem;
+	MessageColorListWidgetItem * m_pForeItems[16];
+	MessageColorListWidgetItem * m_pBackItems[17];
+	MessageListWidgetItem     * m_pLastItem;
 	QCheckBox                  * m_pEnableLogging;
 	QToolButton                * m_pIconButton;
 	KviTalPopupMenu            * m_pIconPopup;
@@ -190,14 +190,14 @@ protected slots:
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviStandardColorsOptionsWidget __tr2qs_no_lookup("theme,colors,messages,output")
 #define KVI_OPTIONS_WIDGET_GROUP_KviStandardColorsOptionsWidget "theme"
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviStandardColorsOptionsWidget 20
-#define KVI_OPTIONS_WIDGET_PARENT_KviStandardColorsOptionsWidget KviMessageOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviStandardColorsOptionsWidget OptionsWidget_message
 
-class KviStandardColorsOptionsWidget : public KviOptionsWidget
+class OptionsWidget_standardColors : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviStandardColorsOptionsWidget(QWidget * par);
-	~KviStandardColorsOptionsWidget();
+	OptionsWidget_standardColors(QWidget * par);
+	~OptionsWidget_standardColors();
 
 };
 
diff --git a/src/modules/options/optw_nickserv.cpp b/src/modules/options/OptionsWidget_nickserv.cpp
index 5fd45bc36..d6da68662 100644
--- a/src/modules/options/optw_nickserv.cpp
+++ b/src/modules/options/OptionsWidget_nickserv.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_nickserv.cpp
+//   File : OptionsWidget_nickserv.cpp
 //   Creation date : Fri Aug 10 2001 03:38:10 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "optw_nickserv.h"
+#include "OptionsWidget_nickserv.h"
 
 #include "KviQString.h"
 #include "KviOptions.h"
@@ -42,7 +42,7 @@
 extern KVIRC_API KviNickServRuleSet * g_pNickServRuleSet;
 
 
-KviNickServRuleEditor::KviNickServRuleEditor(QWidget * par,bool bUseServerMaskField)
+NickServRuleEditor::NickServRuleEditor(QWidget * par,bool bUseServerMaskField)
 : QDialog(par)
 {
 	setWindowTitle(__tr2qs_ctx("NickServ Authentication Rule","options"));
@@ -142,11 +142,11 @@ KviNickServRuleEditor::KviNickServRuleEditor(QWidget * par,bool bUseServerMaskFi
 	setMinimumWidth(250);
 }
 
-KviNickServRuleEditor::~KviNickServRuleEditor()
+NickServRuleEditor::~NickServRuleEditor()
 {
 }
 
-bool KviNickServRuleEditor::validate()
+bool NickServRuleEditor::validate()
 {
 	QString s = m_pRegisteredNickEdit->text();
 
@@ -192,13 +192,13 @@ bool KviNickServRuleEditor::validate()
 	return true;
 }
 
-void KviNickServRuleEditor::okPressed()
+void NickServRuleEditor::okPressed()
 {
 	if(!validate())return;
 	accept();
 }
 
-bool KviNickServRuleEditor::editRule(KviNickServRule * r)
+bool NickServRuleEditor::editRule(KviNickServRule * r)
 {
 	m_pRegisteredNickEdit->setText(r->registeredNick().isEmpty() ? QString("MyNick") : r->registeredNick());
 	m_pNickServMaskEdit->setText(r->nickServMask().isEmpty() ? QString("NickServ!*@*") : r->nickServMask());
@@ -218,7 +218,7 @@ bool KviNickServRuleEditor::editRule(KviNickServRule * r)
 }
 
 
-KviNickServOptionsWidget::KviNickServOptionsWidget(QWidget * parent)
+OptionsWidget_nickServ::OptionsWidget_nickServ(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	createLayout();
@@ -295,16 +295,16 @@ KviNickServOptionsWidget::KviNickServOptionsWidget(QWidget * parent)
 	gl->setRowStretch(1,1);
 }
 
-KviNickServOptionsWidget::~KviNickServOptionsWidget()
+OptionsWidget_nickServ::~OptionsWidget_nickServ()
 {
 }
 
-void KviNickServOptionsWidget::editNickServRule()
+void OptionsWidget_nickServ::editNickServRule()
 {
 	QTreeWidgetItem * it = (QTreeWidgetItem *)m_pNickServTreeWidget->currentItem();
 	if(!it)return;
 	KviNickServRule r(it->text(0),it->text(2),it->text(3),it->text(4),it->text(1));
-	KviNickServRuleEditor ed(this,true);
+	NickServRuleEditor ed(this,true);
 	if(ed.editRule(&r))
 	{
 		it->setText(0,r.registeredNick());
@@ -315,10 +315,10 @@ void KviNickServOptionsWidget::editNickServRule()
 	}
 }
 
-void KviNickServOptionsWidget::addNickServRule()
+void OptionsWidget_nickServ::addNickServRule()
 {
 	KviNickServRule r;
-	KviNickServRuleEditor ed(this,true);
+	NickServRuleEditor ed(this,true);
 	if(ed.editRule(&r))
 	{
 		QTreeWidgetItem* it = new QTreeWidgetItem(m_pNickServTreeWidget);
@@ -330,7 +330,7 @@ void KviNickServOptionsWidget::addNickServRule()
 	}
 }
 
-void KviNickServOptionsWidget::delNickServRule()
+void OptionsWidget_nickServ::delNickServRule()
 {
 	QTreeWidgetItem * it = (QTreeWidgetItem *)m_pNickServTreeWidget->currentItem();
 	if(!it)return;
@@ -338,7 +338,7 @@ void KviNickServOptionsWidget::delNickServRule()
 	enableDisableNickServControls();
 }
 
-void KviNickServOptionsWidget::enableDisableNickServControls()
+void OptionsWidget_nickServ::enableDisableNickServControls()
 {
 	bool bEnabled = m_pNickServCheck->isChecked();
 	m_pNickServTreeWidget->setEnabled(bEnabled);
@@ -348,7 +348,7 @@ void KviNickServOptionsWidget::enableDisableNickServControls()
 	m_pEditRuleButton->setEnabled(bEnabled);
 }
 
-void KviNickServOptionsWidget::commit()
+void OptionsWidget_nickServ::commit()
 {
 	g_pNickServRuleSet->clear();
 	if(m_pNickServTreeWidget->topLevelItemCount())
@@ -367,5 +367,5 @@ void KviNickServOptionsWidget::commit()
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_nickserv.moc"
+#include "m_OptionsWidget_nickserv.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_nickserv.h b/src/modules/options/OptionsWidget_nickserv.h
index 2ec018e5e..74060f091 100644
--- a/src/modules/options/optw_nickserv.h
+++ b/src/modules/options/OptionsWidget_nickserv.h
@@ -3,7 +3,7 @@
 
 //=============================================================================
 //
-//   File : optw_nickserv.h
+//   File : OptionsWidget_nickserv.h
 //   Creation date : Fri Aug 10 2001 03:37:21 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -39,17 +39,17 @@ class QTreeWidget;
 
 #define KVI_OPTIONS_WIDGET_ICON_KviNickServOptionsWidget KVI_SMALLICON_NICKSERV
 #define KVI_OPTIONS_WIDGET_NAME_KviNickServOptionsWidget __tr2qs_no_lookup("NickServ")
-#define KVI_OPTIONS_WIDGET_PARENT_KviNickServOptionsWidget KviToolsOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviNickServOptionsWidget OptionsWidget_tools
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviNickServOptionsWidget __tr2qs_no_lookup("authentication,identify")
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviNickServOptionsWidget 10000
 //#define KVI_OPTIONS_WIDGET_HIDDEN_KviNickServOptionsWidget true
 
-class KviNickServRuleEditor : public QDialog
+class NickServRuleEditor : public QDialog
 {
 	Q_OBJECT
 public:
-	KviNickServRuleEditor(QWidget * par,bool bUseServerMaskField = false);
-	~KviNickServRuleEditor();
+	NickServRuleEditor(QWidget * par,bool bUseServerMaskField = false);
+	~NickServRuleEditor();
 protected:
 	QLineEdit   * m_pRegisteredNickEdit;
 	QLineEdit   * m_pNickServMaskEdit;
@@ -65,12 +65,12 @@ protected slots:
 	void okPressed();
 };
 
-class KviNickServOptionsWidget : public KviOptionsWidget
+class OptionsWidget_nickServ : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviNickServOptionsWidget(QWidget * parent);
-	~KviNickServOptionsWidget();
+	OptionsWidget_nickServ(QWidget * parent);
+	~OptionsWidget_nickServ();
 protected:
 	QTreeWidget * m_pNickServTreeWidget;
 	QCheckBox        * m_pNickServCheck;
diff --git a/src/modules/options/optw_notifier.cpp b/src/modules/options/OptionsWidget_notifier.cpp
index ee33b40fd..d4901aae7 100644
--- a/src/modules/options/optw_notifier.cpp
+++ b/src/modules/options/OptionsWidget_notifier.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_notifier.cpp
+//   File : OptionsWidget_notifier.cpp
 //   Creation date : Thu Jul 09 2009 10:54:39 CEST by Fabio Bas
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,14 +22,14 @@
 //
 //=============================================================================
 
-#include "optw_notifier.h"
+#include "OptionsWidget_notifier.h"
 
 #include "KviOptions.h"
 #include "KviLocale.h"
 
 #include <QLayout>
 
-KviNotifierLookOptionsWidget::KviNotifierLookOptionsWidget(QWidget * parent)
+OptionsWidget_notifierLook::OptionsWidget_notifierLook(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("notifierlook_options_widget");
@@ -94,11 +94,11 @@ KviNotifierLookOptionsWidget::KviNotifierLookOptionsWidget(QWidget * parent)
 	layout()->setRowStretch(5,1);
 }
 
-KviNotifierLookOptionsWidget::~KviNotifierLookOptionsWidget()
+OptionsWidget_notifierLook::~OptionsWidget_notifierLook()
 {
 }
 
-void KviNotifierLookOptionsWidget::commit()
+void OptionsWidget_notifierLook::commit()
 {
 	int iFlags=0;
 	switch(m_pHorizontalAlign->currentIndex())
@@ -132,7 +132,7 @@ void KviNotifierLookOptionsWidget::commit()
 
 
 
-KviNotifierOptionsWidget::KviNotifierOptionsWidget(QWidget * parent)
+OptionsWidget_notifier::OptionsWidget_notifier(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("notifier_options_widget");
@@ -254,9 +254,9 @@ KviNotifierOptionsWidget::KviNotifierOptionsWidget(QWidget * parent)
 	addRowSpacer(0,iRow,0,iRow);
 }
 
-KviNotifierOptionsWidget::~KviNotifierOptionsWidget()
+OptionsWidget_notifier::~OptionsWidget_notifier()
 {
 }
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_input.moc"
+#include "m_OptionsWidget_input.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_notifier.h b/src/modules/options/OptionsWidget_notifier.h
index 789089129..01ba263e9 100644
--- a/src/modules/options/optw_notifier.h
+++ b/src/modules/options/OptionsWidget_notifier.h
@@ -3,7 +3,7 @@
 
 //=============================================================================
 //
-//   File : optw_notifier.h
+//   File : OptionsWidget_notifier.h
 //   Creation date : Thu Jul 09 2009 10:54:39 CEST by Fabio Bas
 //
 //   This file is part of the KVIrc irc client distribution
@@ -34,15 +34,15 @@
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviNotifierLookOptionsWidget __tr2qs_no_lookup("theme,colors,text")
 #define KVI_OPTIONS_WIDGET_GROUP_KviNotifierLookOptionsWidget "theme"
 
-class KviNotifierLookOptionsWidget : public KviOptionsWidget
+class OptionsWidget_notifierLook : public KviOptionsWidget
 {
 	Q_OBJECT
 private:
 	QComboBox* m_pHorizontalAlign;
 	QComboBox* m_pVerticalAlign;
 public:
-	KviNotifierLookOptionsWidget(QWidget * parent);
-	~KviNotifierLookOptionsWidget();
+	OptionsWidget_notifierLook(QWidget * parent);
+	~OptionsWidget_notifierLook();
 
 	virtual void commit();
 };
@@ -50,14 +50,14 @@ public:
 #define KVI_OPTIONS_WIDGET_ICON_KviNotifierOptionsWidget KVI_SMALLICON_ALERT
 #define KVI_OPTIONS_WIDGET_NAME_KviNotifierOptionsWidget __tr2qs_no_lookup("Notifier")
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviNotifierOptionsWidget __tr2qs_no_lookup("popup")
-#define KVI_OPTIONS_WIDGET_PARENT_KviNotifierOptionsWidget KviInterfaceFeaturesOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviNotifierOptionsWidget OptionsWidget_interfaceFeatures
 
-class KviNotifierOptionsWidget : public KviOptionsWidget
+class OptionsWidget_notifier : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviNotifierOptionsWidget(QWidget * parent);
-	~KviNotifierOptionsWidget();
+	OptionsWidget_notifier(QWidget * parent);
+	~OptionsWidget_notifier();
 };
 
 #endif //!_OPTW_NOTIFIER_H_
diff --git a/src/modules/options/optw_notify.cpp b/src/modules/options/OptionsWidget_notify.cpp
index 832836930..ce8ad1338 100644
--- a/src/modules/options/optw_notify.cpp
+++ b/src/modules/options/OptionsWidget_notify.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_notify.cpp
+//   File : OptionsWidget_notify.cpp
 //   Creation date : Sun Oct 28 15:11:29 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "optw_notify.h"
+#include "OptionsWidget_notify.h"
 
 #include "kvi_settings.h"
 #include "KviOptions.h"
@@ -30,7 +30,7 @@
 
 #include <QLayout>
 
-KviNotifyOptionsWidget::KviNotifyOptionsWidget(QWidget * parent)
+OptionsWidget_notify::OptionsWidget_notify(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("notify_options_widget");
@@ -98,10 +98,10 @@ KviNotifyOptionsWidget::KviNotifyOptionsWidget(QWidget * parent)
 	addRowSpacer(0,4,0,4);
 }
 
-KviNotifyOptionsWidget::~KviNotifyOptionsWidget()
+OptionsWidget_notify::~OptionsWidget_notify()
 {
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_notify.moc"
+#include "m_OptionsWidget_notify.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_notify.h b/src/modules/options/OptionsWidget_notify.h
index f0bd7f1bf..ecdf50240 100644
--- a/src/modules/options/optw_notify.h
+++ b/src/modules/options/OptionsWidget_notify.h
@@ -2,7 +2,7 @@
 #define _OPTW_NOTIFY_H_
 //=============================================================================
 //
-//   File : optw_notify.h
+//   File : OptionsWidget_notify.h
 //   Creation date : Sun Oct 28 15:11:30 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -28,16 +28,16 @@
 
 #define KVI_OPTIONS_WIDGET_ICON_KviNotifyOptionsWidget KVI_SMALLICON_REGUSERS
 #define KVI_OPTIONS_WIDGET_NAME_KviNotifyOptionsWidget __tr2qs_no_lookup("Contacts")
-#define KVI_OPTIONS_WIDGET_PARENT_KviNotifyOptionsWidget KviToolsOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviNotifyOptionsWidget OptionsWidget_tools
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviNotifyOptionsWidget __tr2qs_no_lookup("notify,buddy,buddies,friends")
 #define KVI_OPTIONS_WIDGET_MINIMAL_USER_EXPERIENCE_LEVEL_KviNotifyOptionsWidget 2
 
-class KviNotifyOptionsWidget : public KviOptionsWidget
+class OptionsWidget_notify : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviNotifyOptionsWidget(QWidget * parent);
-	~KviNotifyOptionsWidget();
+	OptionsWidget_notify(QWidget * parent);
+	~OptionsWidget_notify();
 };
 
 #endif //_OPTW_NOTIFY_H_
diff --git a/src/modules/options/optw_protection.cpp b/src/modules/options/OptionsWidget_protection.cpp
index b0bf2132c..a9cb10527 100644
--- a/src/modules/options/optw_protection.cpp
+++ b/src/modules/options/OptionsWidget_protection.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_protection.cpp
+//   File : OptionsWidget_protection.cpp
 //   Creation date : Wed Ott 19 16:15:16 2005 GMT by Grifisx & Noldor
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "optw_protection.h"
+#include "OptionsWidget_protection.h"
 
 #include "kvi_settings.h"
 #include "KviOptions.h"
@@ -30,7 +30,7 @@
 
 #include <QLayout>
 
-KviProtectionOptionsWidget::KviProtectionOptionsWidget(QWidget * parent)
+OptionsWidget_protection::OptionsWidget_protection(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("protection_options_widget");
@@ -38,10 +38,10 @@ KviProtectionOptionsWidget::KviProtectionOptionsWidget(QWidget * parent)
 	createLayout();
 }
 
-KviProtectionOptionsWidget::~KviProtectionOptionsWidget()
+OptionsWidget_protection::~OptionsWidget_protection()
 {
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_protection.moc"
+#include "m_OptionsWidget_protection.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_protection.h b/src/modules/options/OptionsWidget_protection.h
index e800ee831..afd1df146 100644
--- a/src/modules/options/optw_protection.h
+++ b/src/modules/options/OptionsWidget_protection.h
@@ -2,7 +2,7 @@
 #define _OPTW_PROTECTION_H_
 //=============================================================================
 //
-//   File : optw_protection.h
+//   File : OptionsWidget_protection.h
 //   Creation date : Wed Ott 19 16:15:16 2005 GMT by Grifisx & Noldor
 //
 //   This file is part of the KVIrc irc client distribution
@@ -30,18 +30,18 @@
 
 #define KVI_OPTIONS_WIDGET_ICON_KviProtectionOptionsWidget KVI_SMALLICON_SPY
 #define KVI_OPTIONS_WIDGET_NAME_KviProtectionOptionsWidget __tr2qs_no_lookup("Protection")
-#define KVI_OPTIONS_WIDGET_PARENT_KviProtectionOptionsWidget KviIrcOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviProtectionOptionsWidget OptionsWidget_irc
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviProtectionOptionsWidget 60000
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviProtectionOptionsWidget __tr2qs_no_lookup("ctcp,flood")
 #define KVI_OPTIONS_WIDGET_CONTAINER_KviProtectionOptionsWidget true
 #define KVI_OPTIONS_WIDGET_NOTCONTAINED_KviProtectionOptionsWidget true
 
-class KviProtectionOptionsWidget : public KviOptionsWidget
+class OptionsWidget_protection : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviProtectionOptionsWidget(QWidget * parent);
-	~KviProtectionOptionsWidget();
+	OptionsWidget_protection(QWidget * parent);
+	~OptionsWidget_protection();
 };
 
 #endif //!_OPTW_PROTECTION_H_
diff --git a/src/modules/options/optw_proxy.cpp b/src/modules/options/OptionsWidget_proxy.cpp
index 113a3591d..d05740441 100644
--- a/src/modules/options/optw_proxy.cpp
+++ b/src/modules/options/OptionsWidget_proxy.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_proxy.cpp
+//   File : OptionsWidget_proxy.cpp
 //   Creation date : Mon Jun 24 2000 22:02:11 by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "optw_proxy.h"
+#include "OptionsWidget_proxy.h"
 
 #include "KviLocale.h"
 #include "KviIconManager.h"
@@ -44,7 +44,7 @@
 #include <QToolButton>
 
 
-KviProxyOptionsTreeWidgetItem::KviProxyOptionsTreeWidgetItem(QTreeWidget *parent,const QPixmap &pm,KviProxy * prx)
+ProxyOptionsTreeWidgetItem::ProxyOptionsTreeWidgetItem(QTreeWidget *parent,const QPixmap &pm,KviProxy * prx)
 : QTreeWidgetItem(parent)
 {
 	qDebug("Creating item");
@@ -53,13 +53,13 @@ KviProxyOptionsTreeWidgetItem::KviProxyOptionsTreeWidgetItem(QTreeWidget *parent
 	m_pProxyData = new KviProxy(*prx);
 }
 
-KviProxyOptionsTreeWidgetItem::~KviProxyOptionsTreeWidgetItem()
+ProxyOptionsTreeWidgetItem::~ProxyOptionsTreeWidgetItem()
 {
 	qDebug("Deleting item");
 	delete m_pProxyData;
 }
 
-KviProxyOptionsWidget::KviProxyOptionsWidget(QWidget * parent)
+OptionsWidget_proxy::OptionsWidget_proxy(QWidget * parent)
 : KviOptionsWidget(parent,"proxy_options_widget")
 {
 	createLayout();
@@ -143,24 +143,24 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(QWidget * parent)
 	m_pContextPopup = new KviTalPopupMenu(this);
 }
 
-KviProxyOptionsWidget::~KviProxyOptionsWidget()
+OptionsWidget_proxy::~OptionsWidget_proxy()
 {
 }
 
-void KviProxyOptionsWidget::ipV6CheckToggled(bool bEnabled)
+void OptionsWidget_proxy::ipV6CheckToggled(bool bEnabled)
 {
 	m_pIpEditor->setAddressType(bEnabled ? KviIpEditor::IPv6 : KviIpEditor::IPv4);
 }
 
-void KviProxyOptionsWidget::fillProxyList()
+void OptionsWidget_proxy::fillProxyList()
 {
-	KviProxyOptionsTreeWidgetItem * prx;
+	ProxyOptionsTreeWidgetItem * prx;
 
 	KviPointerList<KviProxy> * l = g_pProxyDataBase->proxyList();
 
 	for(KviProxy * p = l->first();p;p = l->next())
 	{
-		prx = new KviProxyOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PROXY)),p);
+		prx = new ProxyOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PROXY)),p);
 		if(p == g_pProxyDataBase->currentProxy())
 		{
 			prx->setSelected(true);
@@ -171,10 +171,10 @@ void KviProxyOptionsWidget::fillProxyList()
 	if(!(g_pProxyDataBase->currentProxy()))currentItemChanged(0,0);
 }
 
-void KviProxyOptionsWidget::currentItemChanged(QTreeWidgetItem *it,QTreeWidgetItem *)
+void OptionsWidget_proxy::currentItemChanged(QTreeWidgetItem *it,QTreeWidgetItem *)
 {
 	if(m_pLastEditedItem)saveLastItem();
-	m_pLastEditedItem = (KviProxyOptionsTreeWidgetItem *)it;
+	m_pLastEditedItem = (ProxyOptionsTreeWidgetItem *)it;
 
 	m_pProxyLabel->setEnabled(m_pLastEditedItem);
 	m_pProxyEdit->setEnabled(m_pLastEditedItem);
@@ -239,7 +239,7 @@ void KviProxyOptionsWidget::currentItemChanged(QTreeWidgetItem *it,QTreeWidgetIt
 	}
 }
 
-void KviProxyOptionsWidget::saveLastItem()
+void OptionsWidget_proxy::saveLastItem()
 {
 	if(m_pLastEditedItem)
 	{
@@ -290,16 +290,16 @@ void KviProxyOptionsWidget::saveLastItem()
 	}
 }
 
-void KviProxyOptionsWidget::commit()
+void OptionsWidget_proxy::commit()
 {
 	saveLastItem();
 	g_pProxyDataBase->clear();
-	KviProxyOptionsTreeWidgetItem * it;// = (KviProxyOptionsTreeWidgetItem *)m_pTreeWidget->topLevelItemCount();
+	ProxyOptionsTreeWidgetItem * it;// = (ProxyOptionsTreeWidgetItem *)m_pTreeWidget->topLevelItemCount();
 
 	//while(it)
 	for(int i=0;i<m_pTreeWidget->topLevelItemCount();i++)
 	{
-		it=(KviProxyOptionsTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
+		it=(ProxyOptionsTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
 		QString tmp = it->text(0);
 		if(!tmp.isEmpty())
 		{
@@ -308,7 +308,7 @@ void KviProxyOptionsWidget::commit()
 
 			if(it == m_pLastEditedItem)g_pProxyDataBase->setCurrentProxy(prx);
 		}
-		//it = (KviProxyOptionsTreeWidgetItem *)it->nextSibling();
+		//it = (ProxyOptionsTreeWidgetItem *)it->nextSibling();
 	}
 
 	if(g_pProxyDataBase->currentProxy() == 0)
@@ -319,7 +319,7 @@ void KviProxyOptionsWidget::commit()
 	KviOptionsWidget::commit();
 }
 
-void KviProxyOptionsWidget::customContextMenuRequested(const QPoint &pos)
+void OptionsWidget_proxy::customContextMenuRequested(const QPoint &pos)
 {
 	QTreeWidgetItem *it=(QTreeWidgetItem *)m_pTreeWidget->itemAt(pos);
 	m_pContextPopup->clear();
@@ -328,16 +328,16 @@ void KviProxyOptionsWidget::customContextMenuRequested(const QPoint &pos)
 	m_pContextPopup->popup(QCursor::pos());
 }
 
-void KviProxyOptionsWidget::newProxy()
+void OptionsWidget_proxy::newProxy()
 {
 	KviProxy prx;
-	KviProxyOptionsTreeWidgetItem * it = new KviProxyOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PROXY)),&prx);
+	ProxyOptionsTreeWidgetItem * it = new ProxyOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PROXY)),&prx);
 	it->setSelected(true);
 	m_pTreeWidget->setCurrentItem(it);
 	m_pTreeWidget->scrollToItem(it);
 }
 
-void KviProxyOptionsWidget::removeCurrent()
+void OptionsWidget_proxy::removeCurrent()
 {
 	if(m_pLastEditedItem)
 	{
@@ -360,5 +360,5 @@ void KviProxyOptionsWidget::removeCurrent()
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_proxy.moc"
+#include "m_OptionsWidget_proxy.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_proxy.h b/src/modules/options/OptionsWidget_proxy.h
index 943b01cac..4df390eef 100644
--- a/src/modules/options/optw_proxy.h
+++ b/src/modules/options/OptionsWidget_proxy.h
@@ -2,7 +2,7 @@
 #define _OPTW_PROXY_H_
 //=============================================================================
 //
-//   File : optw_proxy.h
+//   File : OptionsWidget_proxy.h
 //   Creation date : Mon Jun 24 2000 21:58:25 by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -39,11 +39,11 @@ class KviProxyDataBase;
 
 extern KVIRC_API KviProxyDataBase * g_pProxyDataBase;
 
-class KviProxyOptionsTreeWidgetItem : public QTreeWidgetItem
+class ProxyOptionsTreeWidgetItem : public QTreeWidgetItem
 {
 public:
-	KviProxyOptionsTreeWidgetItem(QTreeWidget *parent,const QPixmap &pm,KviProxy * prx);
-	~KviProxyOptionsTreeWidgetItem();
+	ProxyOptionsTreeWidgetItem(QTreeWidget *parent,const QPixmap &pm,KviProxy * prx);
+	~ProxyOptionsTreeWidgetItem();
 public:
 	KviProxy * m_pProxyData;
 };
@@ -51,16 +51,16 @@ public:
 
 #define KVI_OPTIONS_WIDGET_ICON_KviProxyOptionsWidget KVI_SMALLICON_PROXY
 #define KVI_OPTIONS_WIDGET_NAME_KviProxyOptionsWidget __tr2qs_no_lookup("Proxy Hosts")
-#define KVI_OPTIONS_WIDGET_PARENT_KviProxyOptionsWidget KviConnectionOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviProxyOptionsWidget OptionsWidget_connection
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviProxyOptionsWidget __tr2qs_no_lookup("connection,servers")
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviProxyOptionsWidget 70000
 
-class KviProxyOptionsWidget : public KviOptionsWidget
+class OptionsWidget_proxy : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviProxyOptionsWidget(QWidget * parent);
-	~KviProxyOptionsWidget();
+	OptionsWidget_proxy(QWidget * parent);
+	~OptionsWidget_proxy();
 protected:
 	QTreeWidget    * m_pTreeWidget;
 	QLabel       * m_pProxyLabel;
@@ -77,7 +77,7 @@ protected:
 	QComboBox    * m_pProtocolBox;
 	KviTalPopupMenu   * m_pContextPopup;
 	QCheckBox    * m_pIPv6Check;
-	KviProxyOptionsTreeWidgetItem * m_pLastEditedItem;
+	ProxyOptionsTreeWidgetItem * m_pLastEditedItem;
 private:
 
 	void fillProxyList();
diff --git a/src/modules/options/optw_query.cpp b/src/modules/options/OptionsWidget_query.cpp
index b020570dc..8f2dfc865 100644
--- a/src/modules/options/optw_query.cpp
+++ b/src/modules/options/OptionsWidget_query.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_query.cpp
+//   File : OptionsWidget_query.cpp
 //   Creation date : Mon Oct 29 15:37:16 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -23,7 +23,7 @@
 //=============================================================================
 
 
-#include "optw_query.h"
+#include "OptionsWidget_query.h"
 
 #include "KviOptions.h"
 #include "KviLocale.h"
@@ -32,7 +32,7 @@
 #include <QLayout>
 
 
-KviQueryOptionsWidget::KviQueryOptionsWidget(QWidget * parent)
+OptionsWidget_query::OptionsWidget_query(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("query_options_widget");
@@ -106,11 +106,11 @@ KviQueryOptionsWidget::KviQueryOptionsWidget(QWidget * parent)
 	addRowSpacer(0,8,1,8);
 }
 
-KviQueryOptionsWidget::~KviQueryOptionsWidget()
+OptionsWidget_query::~OptionsWidget_query()
 {
 }
 
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_query.moc"
+#include "m_OptionsWidget_query.moc"
 #endif //COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_query.h b/src/modules/options/OptionsWidget_query.h
index 9d1e9c98a..8a385b7a9 100644
--- a/src/modules/options/optw_query.h
+++ b/src/modules/options/OptionsWidget_query.h
@@ -2,7 +2,7 @@
 #define _OPTW_QUERY_H_
 //=============================================================================
 //
-//   File : optw_query.h
+//   File : OptionsWidget_query.h
 //   Creation date : Tue Mar 05 22:31:18 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -28,17 +28,17 @@
 
 #define KVI_OPTIONS_WIDGET_ICON_KviQueryOptionsWidget KVI_SMALLICON_QUERY
 #define KVI_OPTIONS_WIDGET_NAME_KviQueryOptionsWidget __tr2qs_no_lookup("Query")
-#define KVI_OPTIONS_WIDGET_PARENT_KviQueryOptionsWidget KviIrcOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviQueryOptionsWidget OptionsWidget_irc
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviQueryOptionsWidget __tr2qs_no_lookup("chat")
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviQueryOptionsWidget 80000
 #define KVI_OPTIONS_WIDGET_NOTCONTAINED_KviQueryOptionsWidget true
 
-class KviQueryOptionsWidget : public KviOptionsWidget
+class OptionsWidget_query : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviQueryOptionsWidget(QWidget * parent);
-	~KviQueryOptionsWidget();
+	OptionsWidget_query(QWidget * parent);
+	~OptionsWidget_query();
 };
 
 #endif //_OPTW_QUERY_H_
diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/OptionsWidget_servers.cpp
index 68acd25e2..87be984fb 100644
--- a/src/modules/options/optw_servers.cpp
+++ b/src/modules/options/OptionsWidget_servers.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_servers.cpp
+//   File : OptionsWidget_servers.cpp
 //   Creation date : Wed Jun 12 2000 03:29:51 by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,11 +22,11 @@
 //
 //=============================================================================
 
-#include "optw_servers.h"
-#include "optw_proxy.h"
-#include "optw_nickserv.h" // for the NickServ rule editor
+#include "OptionsWidget_servers.h"
+#include "OptionsWidget_proxy.h"
+#include "OptionsWidget_nickserv.h" // for the NickServ rule editor
 
-#include "container.h"
+#include "OptionsWidgetContainer.h"
 
 #include "KviQueryWindow.h"
 #include "KviChannelWindow.h"
@@ -71,7 +71,7 @@
 	#include <QWindowsStyle>
 #endif //COMPILE_ON_WINDOWS || COMPILE_ON_MINGW
 
-KviIrcNetworkDetailsWidget::KviIrcNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n)
+IrcNetworkDetailsWidget::IrcNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n)
 	: QDialog(par)
 {
 	setModal(true);
@@ -382,18 +382,18 @@ KviIrcNetworkDetailsWidget::KviIrcNetworkDetailsWidget(QWidget * par,KviIrcNetwo
 }
 
 
-KviIrcNetworkDetailsWidget::~KviIrcNetworkDetailsWidget()
+IrcNetworkDetailsWidget::~IrcNetworkDetailsWidget()
 {
 	if(m_pOnConnectEditor) KviScriptEditor::destroyInstance(m_pOnConnectEditor);
 	if(m_pOnLoginEditor) KviScriptEditor::destroyInstance(m_pOnLoginEditor);
 }
 
-void KviIrcNetworkDetailsWidget::editNickServRule()
+void IrcNetworkDetailsWidget::editNickServRule()
 {
 	QTreeWidgetItem * it = (QTreeWidgetItem *) m_pNickServTreeWidget->currentItem();
 	if(!it)return;
 	KviNickServRule r(it->text(0),it->text(1),it->text(2),it->text(3));
-	KviNickServRuleEditor ed(this,false);
+	NickServRuleEditor ed(this,false);
 	if(ed.editRule(&r))
 	{
 		it->setText(0,r.registeredNick());
@@ -403,10 +403,10 @@ void KviIrcNetworkDetailsWidget::editNickServRule()
 	}
 }
 
-void KviIrcNetworkDetailsWidget::addNickServRule()
+void IrcNetworkDetailsWidget::addNickServRule()
 {
 	KviNickServRule r;
-	KviNickServRuleEditor ed(this,false);
+	NickServRuleEditor ed(this,false);
 	if(ed.editRule(&r))
 	{
 		QTreeWidgetItem *it = new QTreeWidgetItem(m_pNickServTreeWidget);
@@ -417,7 +417,7 @@ void KviIrcNetworkDetailsWidget::addNickServRule()
 	}
 }
 
-void KviIrcNetworkDetailsWidget::delNickServRule()
+void IrcNetworkDetailsWidget::delNickServRule()
 {
 	QTreeWidgetItem * it = (QTreeWidgetItem *)m_pNickServTreeWidget->currentItem();
 	if(!it)return;
@@ -425,7 +425,7 @@ void KviIrcNetworkDetailsWidget::delNickServRule()
 	enableDisableNickServControls();
 }
 
-void KviIrcNetworkDetailsWidget::enableDisableNickServControls()
+void IrcNetworkDetailsWidget::enableDisableNickServControls()
 {
 	bool bEnabled = m_pNickServCheck->isChecked();
 	m_pNickServTreeWidget->setEnabled(bEnabled);
@@ -435,7 +435,7 @@ void KviIrcNetworkDetailsWidget::enableDisableNickServControls()
 	m_pEditRuleButton->setEnabled(bEnabled);
 }
 
-void KviIrcNetworkDetailsWidget::fillData(KviIrcNetwork * n)
+void IrcNetworkDetailsWidget::fillData(KviIrcNetwork * n)
 {
 	n->setUserName(m_pUserEditor->text());
 	n->setPassword(m_pPassEditor->text());
@@ -498,7 +498,7 @@ void KviIrcNetworkDetailsWidget::fillData(KviIrcNetwork * n)
 }
 
 
-KviIrcServerDetailsWidget::KviIrcServerDetailsWidget(QWidget * par,KviIrcServer * s)
+IrcServerDetailsWidget::IrcServerDetailsWidget(QWidget * par,KviIrcServer * s)
 : QDialog(par)
 {
 	setModal(true);
@@ -994,13 +994,13 @@ KviIrcServerDetailsWidget::KviIrcServerDetailsWidget(QWidget * par,KviIrcServer
 	setHeaderLabelText();
 }
 
-KviIrcServerDetailsWidget::~KviIrcServerDetailsWidget()
+IrcServerDetailsWidget::~IrcServerDetailsWidget()
 {
 	if(m_pOnConnectEditor) KviScriptEditor::destroyInstance(m_pOnConnectEditor);
 	if(m_pOnLoginEditor) KviScriptEditor::destroyInstance(m_pOnLoginEditor);
 }
 
-void KviIrcServerDetailsWidget::useIPV6CheckToggled(bool)
+void IrcServerDetailsWidget::useIPV6CheckToggled(bool)
 {
 #ifdef COMPILE_IPV6_SUPPORT
 	m_pIpEditor->setAddressType(m_pUseIPV6Check->isChecked() ? KviIpEditor::IPv6 : KviIpEditor::IPv4);
@@ -1010,12 +1010,12 @@ void KviIrcServerDetailsWidget::useIPV6CheckToggled(bool)
 	setHeaderLabelText();
 }
 
-void KviIrcServerDetailsWidget::portEditorTextChanged(const QString &)
+void IrcServerDetailsWidget::portEditorTextChanged(const QString &)
 {
 	setHeaderLabelText();
 }
 
-void KviIrcServerDetailsWidget::setHeaderLabelText()
+void IrcServerDetailsWidget::setHeaderLabelText()
 {
 	QString szTmp = "<font size=\"+1\"><b>irc";
 	if(m_pUseIPV6Check->isChecked())szTmp += "6";
@@ -1035,7 +1035,7 @@ void KviIrcServerDetailsWidget::setHeaderLabelText()
 	m_pHeaderLabel->setText(szTmp);
 }
 
-void KviIrcServerDetailsWidget::fillData(KviIrcServer * s)
+void IrcServerDetailsWidget::fillData(KviIrcServer * s)
 {
 	s->setUserName(m_pUserEditor->text());
 	s->setPassword(m_pPassEditor->text());
@@ -1165,7 +1165,7 @@ void KviIrcServerDetailsWidget::fillData(KviIrcServer * s)
 		s->setProxy(m_pProxyEditor->currentIndex()-2);
 }
 
-void KviIrcServerDetailsWidget::useDefaultInitUModeToggled(bool b)
+void IrcServerDetailsWidget::useDefaultInitUModeToggled(bool b)
 {
 	m_pIMode->setEnabled(!b);
 	m_pWMode->setEnabled(!b);
@@ -1175,7 +1175,7 @@ void KviIrcServerDetailsWidget::useDefaultInitUModeToggled(bool b)
 // KviApplication.cpp
 extern KVIRC_API KviIrcServerDataBase * g_pServerDataBase;
 
-KviIrcServerOptionsTreeWidgetItem::KviIrcServerOptionsTreeWidgetItem(QTreeWidget *parent,const QPixmap &pm,const KviIrcNetwork *n)
+IrcServerOptionsTreeWidgetItem::IrcServerOptionsTreeWidgetItem(QTreeWidget *parent,const QPixmap &pm,const KviIrcNetwork *n)
     : QTreeWidgetItem(parent)
 {
 	setIcon(0,QIcon(pm));
@@ -1185,7 +1185,7 @@ KviIrcServerOptionsTreeWidgetItem::KviIrcServerOptionsTreeWidgetItem(QTreeWidget
 	setText(1,n->description());
 }
 
-KviIrcServerOptionsTreeWidgetItem::KviIrcServerOptionsTreeWidgetItem(QTreeWidgetItem *parent,const QPixmap &pm,const KviIrcServer *s)
+IrcServerOptionsTreeWidgetItem::IrcServerOptionsTreeWidgetItem(QTreeWidgetItem *parent,const QPixmap &pm,const KviIrcServer *s)
     : QTreeWidgetItem(parent)
 {
 	setIcon(0,QIcon(pm));
@@ -1195,13 +1195,13 @@ KviIrcServerOptionsTreeWidgetItem::KviIrcServerOptionsTreeWidgetItem(QTreeWidget
 	m_pNetworkData = 0;
 }
 
-KviIrcServerOptionsTreeWidgetItem::~KviIrcServerOptionsTreeWidgetItem()
+IrcServerOptionsTreeWidgetItem::~IrcServerOptionsTreeWidgetItem()
 {
 	if(m_pServerData)delete m_pServerData;
 	if(m_pNetworkData)delete m_pNetworkData;
 }
 
-void KviIrcServerOptionsTreeWidgetItem::updateVisibleStrings()
+void IrcServerOptionsTreeWidgetItem::updateVisibleStrings()
 {
 	if(m_pNetworkData)
 	{
@@ -1217,7 +1217,7 @@ void KviIrcServerOptionsTreeWidgetItem::updateVisibleStrings()
 }
 
 
-KviIrcServerOptionsWidget::KviIrcServerOptionsWidget(QWidget * parent)
+OptionsWidget_servers::OptionsWidget_servers(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("server_options_widget");
@@ -1343,7 +1343,7 @@ KviIrcServerOptionsWidget::KviIrcServerOptionsWidget(QWidget * parent)
 
 
 	// The "Show this dialog at startup" option is shown only when the server options widget is shown as standalone dialog
-	if(parent->inherits("KviOptionsWidgetContainer"))
+	if(parent->inherits("OptionsWidgetContainer"))
 	{
 		m_pConnectCurrent = new QPushButton(__tr2qs_ctx("Connect &Now","options"),this);
 		addWidgetToLayout(m_pConnectCurrent,0,2,1,2);
@@ -1379,7 +1379,7 @@ KviIrcServerOptionsWidget::KviIrcServerOptionsWidget(QWidget * parent)
 
 		KviTalToolTip::add(m_pConnectCurrent,__tr2qs_ctx("<center>Hit this button to connect to the currently selected server.</center>","options"));
 
-		KviOptionsWidgetContainer * pContainer = dynamic_cast<KviOptionsWidgetContainer *>(parent);
+		OptionsWidgetContainer * pContainer = dynamic_cast<OptionsWidgetContainer *>(parent);
 		if(pContainer)
 		{
 			KviBoolSelector * b = addBoolSelector(pContainer,__tr2qs_ctx("Show this dialog at startup","options"),KviOption_boolShowServersConnectDialogOnStart);
@@ -1402,7 +1402,7 @@ KviIrcServerOptionsWidget::KviIrcServerOptionsWidget(QWidget * parent)
 	setMinimumWidth(600);
 }
 
-KviIrcServerOptionsWidget::~KviIrcServerOptionsWidget()
+OptionsWidget_servers::~OptionsWidget_servers()
 {
 	if(m_pImportFilter)
 	{
@@ -1419,7 +1419,7 @@ KviIrcServerOptionsWidget::~KviIrcServerOptionsWidget()
 		delete m_pNetworkDetailsDialog;
 }
 
-void KviIrcServerOptionsWidget::recentServersPopupAboutToShow()
+void OptionsWidget_servers::recentServersPopupAboutToShow()
 {
 	g_pApp->fillRecentServersPopup(m_pRecentPopup);
 
@@ -1427,7 +1427,7 @@ void KviIrcServerOptionsWidget::recentServersPopupAboutToShow()
 	m_pRecentPopup->insertItem(__tr2qs("Clear Recent Servers List"));
 }
 
-void KviIrcServerOptionsWidget::recentServersPopupClicked(int id)
+void OptionsWidget_servers::recentServersPopupClicked(int id)
 {
 	KviConsoleWindow * c = g_pActiveWindow->console();
 	if(!c)
@@ -1446,7 +1446,7 @@ void KviIrcServerOptionsWidget::recentServersPopupClicked(int id)
 	selectBestServerByUrl(szItemText);
 }
 
-void KviIrcServerOptionsWidget::selectBestServerByUrl(const QString &szUrl)
+void OptionsWidget_servers::selectBestServerByUrl(const QString &szUrl)
 {
 	if(szUrl.isEmpty())
 		return;
@@ -1458,12 +1458,12 @@ void KviIrcServerOptionsWidget::selectBestServerByUrl(const QString &szUrl)
 	int uCount = m_pTreeWidget->topLevelItemCount();
 	int uIdx = 0;
 
-	KviIrcServerOptionsTreeWidgetItem * pBestCandidate = NULL;
+	IrcServerOptionsTreeWidgetItem * pBestCandidate = NULL;
 	kvi_u32_t uBestCandidateScore = 0;
 
 	while(uIdx < uCount)
 	{
-		KviIrcServerOptionsTreeWidgetItem * pNet = static_cast<KviIrcServerOptionsTreeWidgetItem *>(m_pTreeWidget->topLevelItem(uIdx));
+		IrcServerOptionsTreeWidgetItem * pNet = static_cast<IrcServerOptionsTreeWidgetItem *>(m_pTreeWidget->topLevelItem(uIdx));
 
 		uIdx++;
 
@@ -1474,7 +1474,7 @@ void KviIrcServerOptionsWidget::selectBestServerByUrl(const QString &szUrl)
 		int uChildIdx = 0;
 		while(uChildIdx < uServerCount)
 		{
-			KviIrcServerOptionsTreeWidgetItem * pServer = static_cast<KviIrcServerOptionsTreeWidgetItem *>(pNet->child(uChildIdx));
+			IrcServerOptionsTreeWidgetItem * pServer = static_cast<IrcServerOptionsTreeWidgetItem *>(pNet->child(uChildIdx));
 			uChildIdx++;
 
 			if(!pServer)
@@ -1515,7 +1515,7 @@ void KviIrcServerOptionsWidget::selectBestServerByUrl(const QString &szUrl)
 
 }
 
-void KviIrcServerOptionsWidget::connectCurrentClicked()
+void OptionsWidget_servers::connectCurrentClicked()
 {
 	saveLastItem();
 	commit();
@@ -1524,11 +1524,11 @@ void KviIrcServerOptionsWidget::connectCurrentClicked()
 	KviKvsScript::run("server -u",g_pApp->activeConsole());
 }
 
-void KviIrcServerOptionsWidget::fillServerList()
+void OptionsWidget_servers::fillServerList()
 {
-	KviIrcServerOptionsTreeWidgetItem * net;
-	KviIrcServerOptionsTreeWidgetItem * srv;
-	KviIrcServerOptionsTreeWidgetItem * cur = 0;
+	IrcServerOptionsTreeWidgetItem * net;
+	IrcServerOptionsTreeWidgetItem * srv;
+	IrcServerOptionsTreeWidgetItem * cur = 0;
 
 	KviPointerHashTableIterator<QString,KviIrcNetwork> it(*(g_pServerDataBase->recordDict()));
 
@@ -1537,13 +1537,13 @@ void KviIrcServerOptionsWidget::fillServerList()
 
 	while(KviIrcNetwork * r = it.current())
 	{
-		net = new KviIrcServerOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),r);
+		net = new IrcServerOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),r);
 		KviPointerList<KviIrcServer> * sl = r->serverList();
 		bool bCurrent = r->name() == g_pServerDataBase->currentNetworkName().toUtf8().data();
 		net->setExpanded(bCurrent);
 		for(KviIrcServer * s = sl->first();s;s = sl->next())
 		{
-			srv = new KviIrcServerOptionsTreeWidgetItem(net,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)),s);
+			srv = new IrcServerOptionsTreeWidgetItem(net,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)),s);
 
 			if((s == r->currentServer()) && bCurrent)
 			{
@@ -1563,15 +1563,15 @@ void KviIrcServerOptionsWidget::fillServerList()
 	}
 }
 
-void KviIrcServerOptionsWidget::itemDoubleClicked(QTreeWidgetItem*, int )
+void OptionsWidget_servers::itemDoubleClicked(QTreeWidgetItem*, int )
 {
 	detailsClicked();
 }
 
-void KviIrcServerOptionsWidget::currentItemChanged(QTreeWidgetItem *it,QTreeWidgetItem *)
+void OptionsWidget_servers::currentItemChanged(QTreeWidgetItem *it,QTreeWidgetItem *)
 {
 	saveLastItem();
-	m_pLastEditedItem = (KviIrcServerOptionsTreeWidgetItem *)it;
+	m_pLastEditedItem = (IrcServerOptionsTreeWidgetItem *)it;
 
 	if(m_pLastEditedItem)
 	{
@@ -1605,7 +1605,7 @@ void KviIrcServerOptionsWidget::currentItemChanged(QTreeWidgetItem *it,QTreeWidg
 	}
 }
 
-void KviIrcServerOptionsWidget::serverNetworkEditTextEdited(const QString &)
+void OptionsWidget_servers::serverNetworkEditTextEdited(const QString &)
 {
 	if(!m_pLastEditedItem)
 		return;
@@ -1618,7 +1618,7 @@ void KviIrcServerOptionsWidget::serverNetworkEditTextEdited(const QString &)
 }
 
 
-void KviIrcServerOptionsWidget::saveLastItem()
+void OptionsWidget_servers::saveLastItem()
 {
 	if(!m_pLastEditedItem)
 		return;
@@ -1640,15 +1640,15 @@ void KviIrcServerOptionsWidget::saveLastItem()
 	}
 }
 
-void KviIrcServerOptionsWidget::commit()
+void OptionsWidget_servers::commit()
 {
 	saveLastItem();
 	g_pServerDataBase->clear();
 
-	KviIrcServerOptionsTreeWidgetItem * network;
+	IrcServerOptionsTreeWidgetItem * network;
 	for (int i=0;i<m_pTreeWidget->topLevelItemCount();i++)
 	{
-		network=(KviIrcServerOptionsTreeWidgetItem *) m_pTreeWidget->topLevelItem(i);
+		network=(IrcServerOptionsTreeWidgetItem *) m_pTreeWidget->topLevelItem(i);
 		QString tmp = network->m_pNetworkData->name();
 		KviIrcNetwork * pNetwork = g_pServerDataBase->findNetwork(tmp);
 		if(pNetwork)
@@ -1661,11 +1661,11 @@ void KviIrcServerOptionsWidget::commit()
 		}
 		if(network == m_pLastEditedItem)g_pServerDataBase->setCurrentNetwork(pNetwork->name());
 
-		KviIrcServerOptionsTreeWidgetItem * ch;
+		IrcServerOptionsTreeWidgetItem * ch;
 		for (int j=0;j<network->childCount();j++)
 		{
 			KviIrcServer *srv;
-			ch=(KviIrcServerOptionsTreeWidgetItem *)network->child(j);
+			ch=(IrcServerOptionsTreeWidgetItem *)network->child(j);
 			if(ch->m_pServerData)
 			{
 				if(!ch->m_pServerData->m_szHostname.isEmpty())
@@ -1694,11 +1694,11 @@ void KviIrcServerOptionsWidget::commit()
 	g_pApp->saveIrcServerDataBase();
 }
 
-void KviIrcServerOptionsWidget::customContextMenuRequested(const QPoint &pnt)
+void OptionsWidget_servers::customContextMenuRequested(const QPoint &pnt)
 {
 	int id;
 	QTreeWidgetItem *it=(QTreeWidgetItem *) m_pTreeWidget->itemAt(pnt);
-	bool bServer = (it && ((KviIrcServerOptionsTreeWidgetItem *)it)->m_pServerData);
+	bool bServer = (it && ((IrcServerOptionsTreeWidgetItem *)it)->m_pServerData);
 	m_pContextPopup->clear();
 	m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),__tr2qs_ctx("New Network","options"),this,SLOT(newNetwork()));
 	id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CUT)),__tr2qs_ctx("Remove Network","options"),this,SLOT(removeCurrent()));
@@ -1720,7 +1720,7 @@ void KviIrcServerOptionsWidget::customContextMenuRequested(const QPoint &pnt)
 	m_pContextPopup->popup(QCursor::pos());
 }
 
-void KviIrcServerOptionsWidget::importPopupAboutToShow()
+void OptionsWidget_servers::importPopupAboutToShow()
 {
 	g_pModuleManager->loadModulesByCaps("serverimport");
 	m_pImportPopup->clear();
@@ -1741,7 +1741,7 @@ void KviIrcServerOptionsWidget::importPopupAboutToShow()
 	}
 }
 
-void KviIrcServerOptionsWidget::importPopupActivated(int id)
+void OptionsWidget_servers::importPopupActivated(int id)
 {
 	// ensure that we have all the modules : they could have been unloaded while the popup was displayed
 	g_pModuleManager->loadModulesByCaps("serverimport");
@@ -1780,25 +1780,25 @@ void KviIrcServerOptionsWidget::importPopupActivated(int id)
 	m_pImportFilter->start();
 }
 
-void KviIrcServerOptionsWidget::importerDead()
+void OptionsWidget_servers::importerDead()
 {
 	m_pImportFilter = 0;
 }
 
-void KviIrcServerOptionsWidget::importServer(const KviIrcServer &s,const QString &network)
+void OptionsWidget_servers::importServer(const KviIrcServer &s,const QString &network)
 {
-	KviIrcServerOptionsTreeWidgetItem * net = findNetItem(network);
+	IrcServerOptionsTreeWidgetItem * net = findNetItem(network);
 	if(!net)
 	{
 		KviIrcNetwork d(network);
-		net = new KviIrcServerOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),&d);
+		net = new IrcServerOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),&d);
 		net->setExpanded(true);
 	}
 
-	KviIrcServerOptionsTreeWidgetItem * srv ;
+	IrcServerOptionsTreeWidgetItem * srv ;
 	for(int i=0;i<net->childCount();i++)
 	{
-		srv=(KviIrcServerOptionsTreeWidgetItem *) net->child(i);
+		srv=(IrcServerOptionsTreeWidgetItem *) net->child(i);
 		if((srv)->m_pServerData->useSSL() == s.useSSL())
 		{
 			if(srv->m_pServerData->isIPv6() == s.isIPv6())
@@ -1819,29 +1819,29 @@ void KviIrcServerOptionsWidget::importServer(const KviIrcServer &s,const QString
 	}
 
 	// not found : add it!
-	KviIrcServerOptionsTreeWidgetItem * newServer = new KviIrcServerOptionsTreeWidgetItem(net,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)),&s);
+	IrcServerOptionsTreeWidgetItem * newServer = new IrcServerOptionsTreeWidgetItem(net,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)),&s);
 	m_pTreeWidget->setCurrentItem(newServer);
 	m_pTreeWidget->scrollToItem(newServer);
 }
 
-void KviIrcServerOptionsWidget::newNetwork()
+void OptionsWidget_servers::newNetwork()
 {
 	KviIrcNetwork d(__tr2qs_ctx("New Network","options"));
-	KviIrcServerOptionsTreeWidgetItem * it = new KviIrcServerOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),&d);
+	IrcServerOptionsTreeWidgetItem * it = new IrcServerOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),&d);
 	it->setExpanded(true);
 	it->setSelected(true);
 	m_pTreeWidget->setCurrentItem(it);
 	m_pTreeWidget->scrollToItem(it);
 }
 
-void KviIrcServerOptionsWidget::newServer()
+void OptionsWidget_servers::newServer()
 {
 	if(m_pLastEditedItem)
 	{
-		KviIrcServerOptionsTreeWidgetItem * net;
+		IrcServerOptionsTreeWidgetItem * net;
 		if(m_pLastEditedItem->m_pServerData)
 		{
-			net = (KviIrcServerOptionsTreeWidgetItem *)m_pLastEditedItem->parent();
+			net = (IrcServerOptionsTreeWidgetItem *)m_pLastEditedItem->parent();
 			if(!net)return;
 		}
 		else net = m_pLastEditedItem;
@@ -1851,7 +1851,7 @@ void KviIrcServerOptionsWidget::newServer()
 		tmp.setCacheIp(false);
 		tmp.generateUniqueId();
 
-		KviIrcServerOptionsTreeWidgetItem * it = new KviIrcServerOptionsTreeWidgetItem(net,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)),&tmp);
+		IrcServerOptionsTreeWidgetItem * it = new IrcServerOptionsTreeWidgetItem(net,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)),&tmp);
 
 		net->setExpanded(true);
 
@@ -1861,7 +1861,7 @@ void KviIrcServerOptionsWidget::newServer()
 	}
 }
 
-void KviIrcServerOptionsWidget::copyServer()
+void OptionsWidget_servers::copyServer()
 {
 	if(m_pLastEditedItem)
 	{
@@ -1874,21 +1874,21 @@ void KviIrcServerOptionsWidget::copyServer()
 	}
 }
 
-void KviIrcServerOptionsWidget::pasteServer()
+void OptionsWidget_servers::pasteServer()
 {
 	if(m_pClipboard)
 	{
 		if(m_pLastEditedItem)
 		{
-			KviIrcServerOptionsTreeWidgetItem * net;
+			IrcServerOptionsTreeWidgetItem * net;
 			if(m_pLastEditedItem->m_pServerData)
 			{
-				net = (KviIrcServerOptionsTreeWidgetItem *)m_pLastEditedItem->parent();
+				net = (IrcServerOptionsTreeWidgetItem *)m_pLastEditedItem->parent();
 				if(!net)return;
 			}
 			else net = m_pLastEditedItem;
 
-			KviIrcServerOptionsTreeWidgetItem * it = new KviIrcServerOptionsTreeWidgetItem(net,
+			IrcServerOptionsTreeWidgetItem * it = new IrcServerOptionsTreeWidgetItem(net,
 							*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)),m_pClipboard);
 
 			net->setExpanded(true);
@@ -1900,7 +1900,7 @@ void KviIrcServerOptionsWidget::pasteServer()
 	}
 }
 
-void KviIrcServerOptionsWidget::removeCurrent()
+void OptionsWidget_servers::removeCurrent()
 {
 	if(m_pLastEditedItem)
 	{
@@ -1927,33 +1927,33 @@ void KviIrcServerOptionsWidget::removeCurrent()
 	}
 }
 
-KviIrcServerOptionsTreeWidgetItem * KviIrcServerOptionsWidget::findNetItem(const QString &netname)
+IrcServerOptionsTreeWidgetItem * OptionsWidget_servers::findNetItem(const QString &netname)
 {
 
-	KviIrcServerOptionsTreeWidgetItem * it;
+	IrcServerOptionsTreeWidgetItem * it;
 	for(int i=0;i<m_pTreeWidget->topLevelItemCount();i++)
 	{
-		it=(KviIrcServerOptionsTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
+		it=(IrcServerOptionsTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
 		if(KviQString::equalCI(it->text(0),netname))return it;
 	}
 	return 0;
 }
 
-void KviIrcServerOptionsWidget::clearList()
+void OptionsWidget_servers::clearList()
 {
 	m_pTreeWidget->clear();
 	m_pLastEditedItem = 0;
 	currentItemChanged(0,0);
 }
 
-void KviIrcServerOptionsWidget::detailsClicked()
+void OptionsWidget_servers::detailsClicked()
 {
 	if(!m_pLastEditedItem)return;
 	if(m_pLastEditedItem->m_pServerData)
 	{
 		saveLastItem();
 
-		m_pServerDetailsDialog = new KviIrcServerDetailsWidget(this,m_pLastEditedItem->m_pServerData);
+		m_pServerDetailsDialog = new IrcServerDetailsWidget(this,m_pLastEditedItem->m_pServerData);
 
 		int retCode = m_pServerDetailsDialog->exec();
 		if(retCode == QDialog::Accepted)
@@ -1976,7 +1976,7 @@ void KviIrcServerOptionsWidget::detailsClicked()
 	{
 		saveLastItem();
 
-		m_pNetworkDetailsDialog = new KviIrcNetworkDetailsWidget(this,m_pLastEditedItem->m_pNetworkData);
+		m_pNetworkDetailsDialog = new IrcNetworkDetailsWidget(this,m_pLastEditedItem->m_pNetworkData);
 
 		int retCode = m_pNetworkDetailsDialog->exec();
 		if(retCode == QDialog::Accepted)
@@ -1997,5 +1997,5 @@ void KviIrcServerOptionsWidget::detailsClicked()
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_servers.moc"
+#include "m_OptionsWidget_servers.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_servers.h b/src/modules/options/OptionsWidget_servers.h
index cbcbf3e87..a8e9f7678 100644
--- a/src/modules/options/optw_servers.h
+++ b/src/modules/options/OptionsWidget_servers.h
@@ -3,7 +3,7 @@
 
 //=============================================================================
 //
-//   File : optw_servers.h
+//   File : OptionsWidget_servers.h
 //   Creation date : Wed Jun 12 2000 03:29:01 by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -43,19 +43,19 @@ class KviIrcServer;
 class KviTalPopupMenu;
 class KviScriptEditor;
 class KviNickServRule;
-class KviNickServRuleEditor;
+class NickServRuleEditor;
 class KviIrcServer;
 class KviIrcNetwork;
 class KviIrcNetworkData;
 class KviMexServerImport;
 
 
-class KviIrcServerOptionsTreeWidgetItem : public QTreeWidgetItem
+class IrcServerOptionsTreeWidgetItem : public QTreeWidgetItem
 {
 public:
-	KviIrcServerOptionsTreeWidgetItem(QTreeWidget *parent,const QPixmap &pm,const KviIrcNetwork *n);
-	KviIrcServerOptionsTreeWidgetItem(QTreeWidgetItem *parent,const QPixmap &pm,const KviIrcServer *s);
-	~KviIrcServerOptionsTreeWidgetItem();
+	IrcServerOptionsTreeWidgetItem(QTreeWidget *parent,const QPixmap &pm,const KviIrcNetwork *n);
+	IrcServerOptionsTreeWidgetItem(QTreeWidgetItem *parent,const QPixmap &pm,const KviIrcServer *s);
+	~IrcServerOptionsTreeWidgetItem();
 public:
 	KviIrcServer * m_pServerData;
 	KviIrcNetwork * m_pNetworkData;
@@ -74,12 +74,12 @@ public:
 };
 
 
-class KviIrcNetworkDetailsWidget : public QDialog
+class IrcNetworkDetailsWidget : public QDialog
 {
 	Q_OBJECT
 public:
-	KviIrcNetworkDetailsWidget(QWidget * par,KviIrcNetwork * d);
-	~KviIrcNetworkDetailsWidget();
+	IrcNetworkDetailsWidget(QWidget * par,KviIrcNetwork * d);
+	~IrcNetworkDetailsWidget();
 protected:
 	KviScriptEditor       * m_pOnConnectEditor;
 	KviScriptEditor       * m_pOnLoginEditor;
@@ -112,12 +112,12 @@ protected slots:
 	void editNickServRule();
 };
 
-class KviIrcServerDetailsWidget : public QDialog
+class IrcServerDetailsWidget : public QDialog
 {
 	Q_OBJECT
 public:
-	KviIrcServerDetailsWidget(QWidget * par,KviIrcServer * s);
-	~KviIrcServerDetailsWidget();
+	IrcServerDetailsWidget(QWidget * par,KviIrcServer * s);
+	~IrcServerDetailsWidget();
 protected:
 	QString                 m_szHostname;
 	QLabel                * m_pHeaderLabel;
@@ -164,15 +164,15 @@ public:
 #define KVI_OPTIONS_WIDGET_ICON_KviIrcServerOptionsWidget KVI_SMALLICON_SERVER
 #define KVI_OPTIONS_WIDGET_NAME_KviIrcServerOptionsWidget __tr2qs_no_lookup("Servers")
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviIrcServerOptionsWidget __tr2qs_no_lookup("connection")
-//#define KVI_OPTIONS_WIDGET_NOPARENT_KviIrcServerOptionsWidget KviConnectionOptionsWidget
+//#define KVI_OPTIONS_WIDGET_NOPARENT_KviIrcServerOptionsWidget OptionsWidget_connection
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviIrcServerOptionsWidget 99000
 
-class KviIrcServerOptionsWidget : public KviOptionsWidget
+class OptionsWidget_servers : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviIrcServerOptionsWidget(QWidget * parent);
-	~KviIrcServerOptionsWidget();
+	OptionsWidget_servers(QWidget * parent);
+	~OptionsWidget_servers();
 protected:
 	QTreeWidget                  * m_pTreeWidget;
 	QLabel                       * m_pSrvNetLabel;
@@ -187,9 +187,9 @@ protected:
 	//QCheckBox                  * m_pIPv6Check;
 	QPushButton                  * m_pConnectCurrent;
 	QPushButton                  * m_pConnectNew;
-	KviIrcServerOptionsTreeWidgetItem * m_pLastEditedItem;
-	KviIrcServerDetailsWidget       * m_pServerDetailsDialog;
-	KviIrcNetworkDetailsWidget      * m_pNetworkDetailsDialog;
+	IrcServerOptionsTreeWidgetItem * m_pLastEditedItem;
+	IrcServerDetailsWidget       * m_pServerDetailsDialog;
+	IrcNetworkDetailsWidget      * m_pNetworkDetailsDialog;
 	KviMexServerImport           * m_pImportFilter;
 
 	QToolButton                  * m_pNewServerButton;
@@ -201,7 +201,7 @@ protected:
 private:
 	void fillServerList();
 	void saveLastItem();
-	KviIrcServerOptionsTreeWidgetItem * findNetItem(const QString &netname);
+	IrcServerOptionsTreeWidgetItem * findNetItem(const QString &netname);
 	void selectBestServerByUrl(const QString &szUrl);
 protected slots:
 	void importerDead();
diff --git a/src/modules/options/optw_sound.cpp b/src/modules/options/OptionsWidget_sound.cpp
index c4c19c45b..c617a8ca4 100644
--- a/src/modules/options/optw_sound.cpp
+++ b/src/modules/options/OptionsWidget_sound.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_sound.cpp
+//   File : OptionsWidget_sound.cpp
 //   Creation date : Fri Sep  6 02:18:23 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVsound sound client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "optw_sound.h"
+#include "OptionsWidget_sound.h"
 
 #include "kvi_settings.h"
 #include "KviLocale.h"
@@ -42,17 +42,17 @@
 
 
 
-KviSoundOptionsWidget::KviSoundOptionsWidget(QWidget * pParent)
+OptionsWidget_sound::OptionsWidget_sound(QWidget * pParent)
 : KviOptionsWidget(pParent)
 {
 }
 
-KviSoundOptionsWidget::~KviSoundOptionsWidget()
+OptionsWidget_sound::~OptionsWidget_sound()
 {
 }
 
 
-KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(QWidget * parent)
+OptionsWidget_soundGeneral::OptionsWidget_soundGeneral(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	m_bFirstShow = true;
@@ -143,11 +143,11 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(QWidget * parent)
 }
 
 
-KviSoundGeneralOptionsWidget::~KviSoundGeneralOptionsWidget()
+OptionsWidget_soundGeneral::~OptionsWidget_soundGeneral()
 {
 }
 
-void KviSoundGeneralOptionsWidget::showEvent(QShowEvent *)
+void OptionsWidget_soundGeneral::showEvent(QShowEvent *)
 {
 	if(!m_bFirstShow)
 		return;
@@ -164,7 +164,7 @@ void KviSoundGeneralOptionsWidget::showEvent(QShowEvent *)
 	m_bFirstShow = false;
 }
 
-void KviSoundGeneralOptionsWidget::soundTest()
+void OptionsWidget_soundGeneral::soundTest()
 {
 	QString szSavedSoundSystem = KVI_OPTION_STRING(KviOption_stringSoundSystem);
 	KVI_OPTION_STRING(KviOption_stringSoundSystem) = m_pSoundSystemBox->currentText();
@@ -187,11 +187,11 @@ void KviSoundGeneralOptionsWidget::soundTest()
 	KVI_OPTION_STRING(KviOption_stringSoundSystem) = szSavedSoundSystem;
 }
 
-void KviSoundGeneralOptionsWidget::mediaTest()
+void OptionsWidget_soundGeneral::mediaTest()
 {
 }
 
-void KviSoundGeneralOptionsWidget::soundAutoDetect()
+void OptionsWidget_soundGeneral::soundAutoDetect()
 {
 	KviModule * m = g_pModuleManager->getModule("snd");
 	if(!m)
@@ -205,7 +205,7 @@ void KviSoundGeneralOptionsWidget::soundAutoDetect()
 	g_pApp->restoreOverrideCursor();
 }
 
-void KviSoundGeneralOptionsWidget::mediaAutoDetect()
+void OptionsWidget_soundGeneral::mediaAutoDetect()
 {
 	KviModule * m = g_pModuleManager->getModule("mediaplayer");
 	if(!m)
@@ -219,7 +219,7 @@ void KviSoundGeneralOptionsWidget::mediaAutoDetect()
 	g_pApp->restoreOverrideCursor();
 }
 
-void KviSoundGeneralOptionsWidget::soundFillBox()
+void OptionsWidget_soundGeneral::soundFillBox()
 {
 	QStringList l;
 	QStringList::Iterator it;
@@ -259,7 +259,7 @@ disable:
 	m_pSoundAutoDetectButton->setEnabled(false);
 }
 
-void KviSoundGeneralOptionsWidget::mediaFillBox()
+void OptionsWidget_soundGeneral::mediaFillBox()
 {
 	QStringList l;
 	QStringList::Iterator it;
@@ -294,7 +294,7 @@ disable:
 	m_pMediaAutoDetectButton->setEnabled(false);
 }
 
-void KviSoundGeneralOptionsWidget::commit()
+void OptionsWidget_soundGeneral::commit()
 {
 	// avoid to commit if we've never been shown (and initialized)
 	if(m_bFirstShow)
@@ -326,7 +326,7 @@ void KviSoundGeneralOptionsWidget::commit()
 #endif
 }
 
-KviSoundsOptionsWidget::KviSoundsOptionsWidget(QWidget * parent)
+OptionsWidget_sounds::OptionsWidget_sounds(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("sound_options_widget");
@@ -347,10 +347,10 @@ KviSoundsOptionsWidget::KviSoundsOptionsWidget(QWidget * parent)
 
 }
 
-KviSoundsOptionsWidget::~KviSoundsOptionsWidget()
+OptionsWidget_sounds::~OptionsWidget_sounds()
 {
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_sound.moc"
+#include "m_OptionsWidget_sound.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_sound.h b/src/modules/options/OptionsWidget_sound.h
index c7373bb2d..68e82cc5a 100644
--- a/src/modules/options/optw_sound.h
+++ b/src/modules/options/OptionsWidget_sound.h
@@ -2,7 +2,7 @@
 #define _OPTW_SOUND_H_
 //=============================================================================
 //
-//   File : optw_sound.h
+//   File : OptionsWidget_sound.h
 //   Creation date : Fri Sep  6 02:18:21 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -31,30 +31,30 @@
 
 #define KVI_OPTIONS_WIDGET_ICON_KviSoundOptionsWidget KVI_SMALLICON_SOUND
 #define KVI_OPTIONS_WIDGET_NAME_KviSoundOptionsWidget __tr2qs_no_lookup("Sound")
-#define KVI_OPTIONS_WIDGET_PARENT_KviSoundOptionsWidget KviGeneralOptOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviSoundOptionsWidget OptionsWidget_general
 #define KVI_OPTIONS_WIDGET_CONTAINER_KviSoundOptionsWidget true
 
 
-class KviSoundOptionsWidget : public KviOptionsWidget
+class OptionsWidget_sound : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviSoundOptionsWidget(QWidget * parent);
-	~KviSoundOptionsWidget();
+	OptionsWidget_sound(QWidget * parent);
+	~OptionsWidget_sound();
 };
 
 #define KVI_OPTIONS_WIDGET_ICON_KviSoundGeneralOptionsWidget KVI_SMALLICON_SOUND
 #define KVI_OPTIONS_WIDGET_NAME_KviSoundGeneralOptionsWidget __tr2qs_no_lookup("Sound System")
-#define KVI_OPTIONS_WIDGET_PARENT_KviSoundGeneralOptionsWidget KviSoundOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviSoundGeneralOptionsWidget OptionsWidget_sound
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviSoundGeneralOptionsWidget __tr2qs_no_lookup("sound,xmms,audio,play,amarok")
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviSoundGeneralOptionsWidget 70000
 
-class KviSoundGeneralOptionsWidget : public KviOptionsWidget
+class OptionsWidget_soundGeneral : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviSoundGeneralOptionsWidget(QWidget * parent);
-	~KviSoundGeneralOptionsWidget();
+	OptionsWidget_soundGeneral(QWidget * parent);
+	~OptionsWidget_soundGeneral();
 protected:
 	QComboBox * m_pSoundSystemBox;
 	QPushButton * m_pSoundTestButton;
@@ -82,16 +82,16 @@ protected slots:
 
 #define KVI_OPTIONS_WIDGET_ICON_KviSoundsOptionsWidget KVI_SMALLICON_SOUND
 #define KVI_OPTIONS_WIDGET_NAME_KviSoundsOptionsWidget __tr2qs_no_lookup("Sounds")
-#define KVI_OPTIONS_WIDGET_PARENT_KviSoundsOptionsWidget KviSoundOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviSoundsOptionsWidget OptionsWidget_sound
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviSoundsOptionsWidget __tr2qs_no_lookup("sound,events")
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviSoundsOptionsWidget 80000
 
-class KviSoundsOptionsWidget : public KviOptionsWidget
+class OptionsWidget_sounds : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviSoundsOptionsWidget(QWidget * parent);
-	~KviSoundsOptionsWidget();
+	OptionsWidget_sounds(QWidget * parent);
+	~OptionsWidget_sounds();
 };
 
 #endif //_OPTW_SOUND_H_
diff --git a/src/modules/options/optw_textencoding.cpp b/src/modules/options/OptionsWidget_textEncoding.cpp
index 4743b1fd4..d471466f0 100644
--- a/src/modules/options/optw_textencoding.cpp
+++ b/src/modules/options/OptionsWidget_textEncoding.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_textencoding.cpp
+//   File : OptionsWidget_textEncoding.cpp
 //   Creation date : Sat Aug 11 2001 03:29:52 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "optw_textencoding.h"
+#include "OptionsWidget_textEncoding.h"
 
 #include "KviOptions.h"
 #include "KviLocale.h"
@@ -35,7 +35,7 @@
 
 QString g_szPrevSettedLocale;
 
-KviTextEncodingOptionsWidget::KviTextEncodingOptionsWidget(QWidget * parent)
+OptionsWidget_textEncoding::OptionsWidget_textEncoding(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("textencoding_options_widget");
@@ -124,11 +124,11 @@ KviTextEncodingOptionsWidget::KviTextEncodingOptionsWidget(QWidget * parent)
 	addRowSpacer(0,4,1,4);
 }
 
-KviTextEncodingOptionsWidget::~KviTextEncodingOptionsWidget()
+OptionsWidget_textEncoding::~OptionsWidget_textEncoding()
 {
 }
 
-void KviTextEncodingOptionsWidget::commit()
+void OptionsWidget_textEncoding::commit()
 {
 	int idx = m_pTextEncodingCombo->currentIndex();
 	if(idx <= 0)
@@ -165,5 +165,5 @@ void KviTextEncodingOptionsWidget::commit()
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_textencoding.moc"
+#include "m_OptionsWidget_textEncoding.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_textencoding.h b/src/modules/options/OptionsWidget_textEncoding.h
index 9220bba09..d9d60eb9d 100644
--- a/src/modules/options/optw_textencoding.h
+++ b/src/modules/options/OptionsWidget_textEncoding.h
@@ -2,7 +2,7 @@
 #define _OPTW_TEXTENCODING_H_
 //=============================================================================
 //
-//   File : optw_textencoding.h
+//   File : OptionsWidget_textEncoding.h
 //   Creation date : Sat Mar 02 2002 12:09:19 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -31,15 +31,15 @@
 #define KVI_OPTIONS_WIDGET_ICON_KviTextEncodingOptionsWidget KVI_SMALLICON_TEXTENCODING
 #define KVI_OPTIONS_WIDGET_NAME_KviTextEncodingOptionsWidget __tr2qs_no_lookup("Language")
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviTextEncodingOptionsWidget 50000
-#define KVI_OPTIONS_WIDGET_PARENT_KviTextEncodingOptionsWidget KviGeneralOptOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviTextEncodingOptionsWidget OptionsWidget_general
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviTextEncodingOptionsWidget __tr2qs_no_lookup("language,encoding,charset,codepage")
 
-class KviTextEncodingOptionsWidget : public KviOptionsWidget
+class OptionsWidget_textEncoding : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviTextEncodingOptionsWidget(QWidget * parent);
-	~KviTextEncodingOptionsWidget();
+	OptionsWidget_textEncoding(QWidget * parent);
+	~OptionsWidget_textEncoding();
 protected:
 	QString     m_szLanguage;
 	QComboBox * m_pTextEncodingCombo;
diff --git a/src/modules/options/optw_texticons.cpp b/src/modules/options/OptionsWidget_textIcons.cpp
index f2da5fd10..0c1e68a81 100644
--- a/src/modules/options/optw_texticons.cpp
+++ b/src/modules/options/OptionsWidget_textIcons.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_texticons.cpp
+//   File : OptionsWidget_textIcons.cpp
 //   Creation date : Fri May 24 2002 00:16:13 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "optw_texticons.h"
+#include "OptionsWidget_textIcons.h"
 
 #include "KviIconManager.h"
 #include "KviTextIconManager.h"
@@ -35,7 +35,7 @@
 #include <QCursor>
 #include <QHeaderView>
 
-KviTextIconTableItem::KviTextIconTableItem(QTableWidget *,KviTextIcon * icon)
+TextIconTableItem::TextIconTableItem(QTableWidget *,KviTextIcon * icon)
 : QTableWidgetItem(QString(),Qt::ItemIsEditable)
 {
 	if(icon)
@@ -46,13 +46,13 @@ KviTextIconTableItem::KviTextIconTableItem(QTableWidget *,KviTextIcon * icon)
 	if(pix) setIcon(QIcon(*pix));
 }
 
-KviTextIconTableItem::~KviTextIconTableItem()
+TextIconTableItem::~TextIconTableItem()
 {
 	delete m_pIcon;
 
 }
 
-void KviTextIconTableItem::setId(int id)
+void TextIconTableItem::setId(int id)
 {
 	m_pIcon->setId(id);
 	QPixmap* pix=m_pIcon->pixmap();
@@ -60,7 +60,7 @@ void KviTextIconTableItem::setId(int id)
 }
 
 
-KviTextIconsOptionsWidget::KviTextIconsOptionsWidget(QWidget * parent)
+OptionsWidget_textIcons::OptionsWidget_textIcons(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	m_pBox=0;
@@ -106,7 +106,7 @@ KviTextIconsOptionsWidget::KviTextIconsOptionsWidget(QWidget * parent)
 	fillTable();
 }
 
-KviTextIconsOptionsWidget::~KviTextIconsOptionsWidget()
+OptionsWidget_textIcons::~OptionsWidget_textIcons()
 {
 	if(m_pIconButton)
 		delete m_pIconButton;
@@ -116,7 +116,7 @@ KviTextIconsOptionsWidget::~KviTextIconsOptionsWidget()
 		delete m_pBox;
 }
 
-void KviTextIconsOptionsWidget::fillTable()
+void OptionsWidget_textIcons::fillTable()
 {
 	KviPointerHashTableIterator<QString,KviTextIcon> it(*(g_pTextIconManager->textIconDict()));
 
@@ -129,7 +129,7 @@ void KviTextIconsOptionsWidget::fillTable()
 	
 	int idx = 0;
 	QTableWidgetItem *item0;
-	KviTextIconTableItem *item1;
+	TextIconTableItem *item1;
 	while(KviTextIcon * i = it.current())
 	{
 		if(!m_pTable->item(idx,0))
@@ -138,7 +138,7 @@ void KviTextIconsOptionsWidget::fillTable()
 			m_pTable->setItem(idx,0,item0);
 		}
 
-		item1 = new KviTextIconTableItem(m_pTable,new KviTextIcon(i));
+		item1 = new TextIconTableItem(m_pTable,new KviTextIcon(i));
 		//remove from the item the ability to be edited as text
 		item1->setFlags(item1->flags() ^ Qt::ItemIsEditable);
 		m_pTable->setItem(idx,1,item1);
@@ -151,7 +151,7 @@ void KviTextIconsOptionsWidget::fillTable()
 	m_pDel->setEnabled(false);
 }
 
-void KviTextIconsOptionsWidget::doPopup()
+void OptionsWidget_textIcons::doPopup()
 {
 	if(!m_pPopup)
 	{
@@ -163,14 +163,14 @@ void KviTextIconsOptionsWidget::doPopup()
 	m_pPopup->popup(QCursor::pos());
 }
 
-void KviTextIconsOptionsWidget::iconSelected(int id)
+void OptionsWidget_textIcons::iconSelected(int id)
 {
 	m_pItem->icon()->setId(id);
 	m_pItem->setIcon(QIcon(*m_pItem->icon()->pixmap()));
 	m_pIconButton->setIcon(QIcon(*m_pItem->icon()->pixmap()));
 }
 
-void KviTextIconsOptionsWidget::chooseFromFile()
+void OptionsWidget_textIcons::chooseFromFile()
 {
 	QString szFile;
 	KviFileDialog::askForOpenFileName(szFile,"Choose icon filename",QString(),KVI_FILTER_IMAGE,"options");
@@ -184,17 +184,17 @@ void KviTextIconsOptionsWidget::chooseFromFile()
 		}
 	}
 }
-void KviTextIconsOptionsWidget::itemSelectionChanged()
+void OptionsWidget_textIcons::itemSelectionChanged()
 {
 	int i = m_pTable->currentRow();
 	m_pDel->setEnabled(i >= 0 && i < m_pTable->rowCount());
 }
-void KviTextIconsOptionsWidget::itemClicked(QTableWidgetItem *i)
+void OptionsWidget_textIcons::itemClicked(QTableWidgetItem *i)
 {
 	if (i->column()!=1) return;
 	if (m_iLastEditedRow==i->row()) return;
 
-	m_pItem=(KviTextIconTableItem *)i;
+	m_pItem=(TextIconTableItem *)i;
 
 	if(m_pIconButton)
 		delete m_pIconButton;
@@ -220,22 +220,22 @@ void KviTextIconsOptionsWidget::itemClicked(QTableWidgetItem *i)
 	m_iLastEditedRow=i->row();
 }
 
-void KviTextIconsOptionsWidget::addClicked()
+void OptionsWidget_textIcons::addClicked()
 {
 	m_pTable->setRowCount(m_pTable->rowCount() + 1);
 	m_pTable->setItem(m_pTable->rowCount() - 1,0,new QTableWidgetItem(__tr2qs_ctx("unnamed","options")));
-	m_pTable->setItem(m_pTable->rowCount() - 1,1,new KviTextIconTableItem(m_pTable,0));
+	m_pTable->setItem(m_pTable->rowCount() - 1,1,new TextIconTableItem(m_pTable,0));
 	m_pTable->scrollToBottom();
 	m_pDel->setEnabled(true);
 }
 
-void KviTextIconsOptionsWidget::restoreClicked()
+void OptionsWidget_textIcons::restoreClicked()
 {
 	g_pTextIconManager->checkDefaultAssociations();
 	fillTable();
 }
 
-void KviTextIconsOptionsWidget::delClicked()
+void OptionsWidget_textIcons::delClicked()
 {
 	int i = m_pTable->currentRow();
 
@@ -261,7 +261,7 @@ void KviTextIconsOptionsWidget::delClicked()
 	}
 }
 
-void KviTextIconsOptionsWidget::commit()
+void OptionsWidget_textIcons::commit()
 {
 
 	KviOptionsWidget::commit();
@@ -272,7 +272,7 @@ void KviTextIconsOptionsWidget::commit()
 		QString szVal = m_pTable->item(i,0)->text();
 		if(!szVal.isEmpty())
 		{
-			KviTextIconTableItem * it = (KviTextIconTableItem *)m_pTable->item(i,1);
+			TextIconTableItem * it = (TextIconTableItem *)m_pTable->item(i,1);
 			if(it)
 			{
 				g_pTextIconManager->insert(szVal,*(it->icon()));
@@ -287,5 +287,5 @@ void KviTextIconsOptionsWidget::commit()
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_texticons.moc"
+#include "m_OptionsWidget_textIcons.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_texticons.h b/src/modules/options/OptionsWidget_textIcons.h
index 6fe18e55e..b53dcad93 100644
--- a/src/modules/options/optw_texticons.h
+++ b/src/modules/options/OptionsWidget_textIcons.h
@@ -2,7 +2,7 @@
 #define _OPTW_TEXTICONS_H_
 //=============================================================================
 //
-//   File : optw_texticons.h
+//   File : OptionsWidget_textIcons.h
 //   Creation date : Fri May 24 2002 00:14:02 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -33,19 +33,19 @@
 #include <QTableWidget>
 #include <QTableWidgetItem>
 
-class KviTextIconTableItem;
+class TextIconTableItem;
 
 #define KVI_OPTIONS_WIDGET_ICON_KviTextIconsOptionsWidget KVI_SMALLICON_BIGGRIN
 #define KVI_OPTIONS_WIDGET_NAME_KviTextIconsOptionsWidget __tr2qs_no_lookup("Text icons")
-#define KVI_OPTIONS_WIDGET_PARENT_KviTextIconsOptionsWidget KviToolsOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviTextIconsOptionsWidget OptionsWidget_tools
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviTextIconsOptionsWidget __tr2qs_no_lookup("smileys,emoticons")
 
-class KviTextIconTableItem : public QTableWidgetItem
+class TextIconTableItem : public QTableWidgetItem
 {
-	friend class KviTextIconsOptionsWidget;
+	friend class OptionsWidget_textIcons;
 public:
-	KviTextIconTableItem(QTableWidget * t,KviTextIcon * icon);
-	~KviTextIconTableItem();
+	TextIconTableItem(QTableWidget * t,KviTextIcon * icon);
+	~TextIconTableItem();
 protected:
 	KviTextIcon * m_pIcon;
 public:
@@ -54,16 +54,16 @@ public:
 
 };
 
-class KviTextIconsOptionsWidget : public KviOptionsWidget
+class OptionsWidget_textIcons : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviTextIconsOptionsWidget(QWidget * parent);
-	~KviTextIconsOptionsWidget();
+	OptionsWidget_textIcons(QWidget * parent);
+	~OptionsWidget_textIcons();
 protected:
 	QTableWidget * m_pTable;
 	int m_iLastEditedRow;
-	KviTextIconTableItem *m_pItem;
+	TextIconTableItem *m_pItem;
 	QPushButton  * m_pAdd;
 	QPushButton  * m_pDel;
 	QPushButton  * m_pRestore;
diff --git a/src/modules/options/optw_interfacelookglobal.cpp b/src/modules/options/OptionsWidget_theme.cpp
index 780adf84f..f2518fd1d 100644
--- a/src/modules/options/optw_interfacelookglobal.cpp
+++ b/src/modules/options/OptionsWidget_theme.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_interfacelookglobal.cpp
+//   File : OptionsWidget_theme.cpp
 //   Creation date : Sun Jun 3 2001 20:50:13 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "optw_interfacelookglobal.h"
+#include "OptionsWidget_theme.h"
 
 #include "kvi_settings.h"
 #include "KviOptions.h"
@@ -34,7 +34,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-KviThemeGeneralOptionsWidget::KviThemeGeneralOptionsWidget(QWidget * parent)
+OptionsWidget_theme::OptionsWidget_theme(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	createLayout();
@@ -50,14 +50,14 @@ KviThemeGeneralOptionsWidget::KviThemeGeneralOptionsWidget(QWidget * parent)
 	addRowSpacer(0,3,1,3);
 }
 
-KviThemeGeneralOptionsWidget::~KviThemeGeneralOptionsWidget()
+OptionsWidget_theme::~OptionsWidget_theme()
 {
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviThemeTransparencyOptionsWidget::KviThemeTransparencyOptionsWidget(QWidget * parent)
+OptionsWidget_themeTransparency::OptionsWidget_themeTransparency(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 #ifdef COMPILE_PSEUDO_TRANSPARENCY
@@ -136,11 +136,11 @@ KviThemeTransparencyOptionsWidget::KviThemeTransparencyOptionsWidget(QWidget * p
 #endif
 }
 
-KviThemeTransparencyOptionsWidget::~KviThemeTransparencyOptionsWidget()
+OptionsWidget_themeTransparency::~OptionsWidget_themeTransparency()
 {
 }
 
-void KviThemeTransparencyOptionsWidget::enableGlobalBackgroundPixmapSelector(bool)
+void OptionsWidget_themeTransparency::enableGlobalBackgroundPixmapSelector(bool)
 {
 #ifdef COMPILE_PSEUDO_TRANSPARENCY
 	#ifdef COMPILE_X11_SUPPORT
@@ -156,7 +156,7 @@ void KviThemeTransparencyOptionsWidget::enableGlobalBackgroundPixmapSelector(boo
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviThemeMdiAreaOptionsWidget::KviThemeMdiAreaOptionsWidget(QWidget * parent)
+OptionsWidget_themeMdiArea::OptionsWidget_themeMdiArea(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	createLayout();
@@ -167,14 +167,14 @@ KviThemeMdiAreaOptionsWidget::KviThemeMdiAreaOptionsWidget(QWidget * parent)
 	layout()->setRowStretch(1,1);
 }
 
-KviThemeMdiAreaOptionsWidget::~KviThemeMdiAreaOptionsWidget()
+OptionsWidget_themeMdiArea::~OptionsWidget_themeMdiArea()
 {
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviThemeToolBarAppletsOptionsWidget::KviThemeToolBarAppletsOptionsWidget(QWidget * parent)
+OptionsWidget_themeToolBarApplets::OptionsWidget_themeToolBarApplets(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	createLayout();
@@ -194,11 +194,11 @@ KviThemeToolBarAppletsOptionsWidget::KviThemeToolBarAppletsOptionsWidget(QWidget
 	layout()->setRowStretch(8,1);
 }
 
-KviThemeToolBarAppletsOptionsWidget::~KviThemeToolBarAppletsOptionsWidget()
+OptionsWidget_themeToolBarApplets::~OptionsWidget_themeToolBarApplets()
 {
 }
 
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_interfacelookglobal.moc"
+#include "m_OptionsWidget_theme.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_interfacelookglobal.h b/src/modules/options/OptionsWidget_theme.h
index 773c26e53..0196ad816 100644
--- a/src/modules/options/optw_interfacelookglobal.h
+++ b/src/modules/options/OptionsWidget_theme.h
@@ -2,7 +2,7 @@
 #define _OPTW_INTERFACELOOKGLOBAL_H_
 //=============================================================================
 //
-//   File : optw_interfacelookglobal.h
+//   File : OptionsWidget_theme.h
 //   Creation date : Sun Jun 3 2001 20:49:02 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -35,12 +35,12 @@
 #define KVI_OPTIONS_WIDGET_GROUP_KviThemeGeneralOptionsWidget "theme"
 
 
-class KviThemeGeneralOptionsWidget : public KviOptionsWidget
+class OptionsWidget_theme : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviThemeGeneralOptionsWidget(QWidget * parent);
-	~KviThemeGeneralOptionsWidget();
+	OptionsWidget_theme(QWidget * parent);
+	~OptionsWidget_theme();
 };
 
 
@@ -50,12 +50,12 @@ public:
 #define KVI_OPTIONS_WIDGET_GROUP_KviThemeTransparencyOptionsWidget "theme"
 
 
-class KviThemeTransparencyOptionsWidget : public KviOptionsWidget
+class OptionsWidget_themeTransparency : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviThemeTransparencyOptionsWidget(QWidget * parent);
-	~KviThemeTransparencyOptionsWidget();
+	OptionsWidget_themeTransparency(QWidget * parent);
+	~OptionsWidget_themeTransparency();
 protected:
 #ifdef COMPILE_PSEUDO_TRANSPARENCY
 	KviPixmapSelector * m_pGlobalBackgroundPixmapSelector;
@@ -75,12 +75,12 @@ protected slots:
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviThemeMdiAreaOptionsWidget __tr2qs_no_lookup("theme,mdi")
 #define KVI_OPTIONS_WIDGET_GROUP_KviThemeMdiAreaOptionsWidget "theme"
 
-class KviThemeMdiAreaOptionsWidget : public KviOptionsWidget
+class OptionsWidget_themeMdiArea : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviThemeMdiAreaOptionsWidget(QWidget * parent);
-	~KviThemeMdiAreaOptionsWidget();
+	OptionsWidget_themeMdiArea(QWidget * parent);
+	~OptionsWidget_themeMdiArea();
 };
 
 #define KVI_OPTIONS_WIDGET_ICON_KviThemeToolBarAppletsOptionsWidget KVI_SMALLICON_APPLET
@@ -89,12 +89,12 @@ public:
 #define KVI_OPTIONS_WIDGET_GROUP_KviThemeToolBarAppletsOptionsWidget "theme"
 
 
-class KviThemeToolBarAppletsOptionsWidget : public KviOptionsWidget
+class OptionsWidget_themeToolBarApplets : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviThemeToolBarAppletsOptionsWidget(QWidget * parent);
-	~KviThemeToolBarAppletsOptionsWidget();
+	OptionsWidget_themeToolBarApplets(QWidget * parent);
+	~OptionsWidget_themeToolBarApplets();
 };
 
 #endif //!_OPTW_INTERFACELOOKGLOBAL_H_
diff --git a/src/modules/options/optw_tools.cpp b/src/modules/options/OptionsWidget_tools.cpp
index ebd588bdc..2f5015fa7 100644
--- a/src/modules/options/optw_tools.cpp
+++ b/src/modules/options/OptionsWidget_tools.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_tools.cpp
+//   File : OptionsWidget_tools.cpp
 //   Creation date : Wed Ott 19 16:15:16 2005 GMT by Grifisx & Noldor
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "optw_tools.h"
+#include "OptionsWidget_tools.h"
 
 #include "kvi_settings.h"
 #include "KviOptions.h"
@@ -30,7 +30,7 @@
 
 #include <QLayout>
 
-KviToolsOptionsWidget::KviToolsOptionsWidget(QWidget * parent)
+OptionsWidget_tools::OptionsWidget_tools(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("tools_options_widget");
@@ -42,10 +42,10 @@ KviToolsOptionsWidget::KviToolsOptionsWidget(QWidget * parent)
 
 }
 
-KviToolsOptionsWidget::~KviToolsOptionsWidget()
+OptionsWidget_tools::~OptionsWidget_tools()
 {
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_tools.moc"
+#include "m_OptionsWidget_tools.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_tools.h b/src/modules/options/OptionsWidget_tools.h
index d407d0187..53b7193fb 100644
--- a/src/modules/options/optw_tools.h
+++ b/src/modules/options/OptionsWidget_tools.h
@@ -3,7 +3,7 @@
 
 //=============================================================================
 //
-//   File : optw_tools.h
+//   File : OptionsWidget_tools.h
 //   Creation date : Wed Ott 19 16:15:16 2005 GMT by Grifisx & Noldor
 //
 //   This file is part of the KVIrc irc client distribution
@@ -31,16 +31,16 @@
 
 #define KVI_OPTIONS_WIDGET_ICON_KviToolsOptionsWidget KVI_SMALLICON_ADDONS
 #define KVI_OPTIONS_WIDGET_NAME_KviToolsOptionsWidget __tr2qs_no_lookup("Tools")
-#define KVI_OPTIONS_WIDGET_PARENT_KviToolsOptionsWidget KviIrcOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviToolsOptionsWidget OptionsWidget_irc
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviToolsOptionsWidget 50000
 #define KVI_OPTIONS_WIDGET_NOTCONTAINED_KviToolsOptionsWidget true
 
-class KviToolsOptionsWidget : public KviOptionsWidget
+class OptionsWidget_tools : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviToolsOptionsWidget(QWidget * parent);
-	~KviToolsOptionsWidget();
+	OptionsWidget_tools(QWidget * parent);
+	~OptionsWidget_tools();
 };
 
 #endif //!_OPTW_FOLDERS_H_
diff --git a/src/modules/options/optw_topiclabel.cpp b/src/modules/options/OptionsWidget_topicLabel.cpp
index 2dde27d19..b305771ee 100644
--- a/src/modules/options/optw_topiclabel.cpp
+++ b/src/modules/options/OptionsWidget_topicLabel.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_topiclabel.cpp
+//   File : OptionsWidget_topicLabel.cpp
 //   Creation date : Mon Sep 24 02:44:55 CEST 2001 by Krzysztof Godlewski
 //
 //   This file is part of the KVIrc irc client distribution
@@ -23,13 +23,13 @@
 //
 //=============================================================================
 
-#include "optw_topiclabel.h"
+#include "OptionsWidget_topicLabel.h"
 
 #include "KviOptions.h"
 #include "KviLocale.h"
 
 
-KviTopicLabelLookOptionsWidget::KviTopicLabelLookOptionsWidget(QWidget *p):KviOptionsWidget(p, "topic_label_look_options_widget")
+OptionsWidget_topicLabel::OptionsWidget_topicLabel(QWidget *p):KviOptionsWidget(p, "topic_label_look_options_widget")
 {
 	createLayout();
 
@@ -41,10 +41,10 @@ KviTopicLabelLookOptionsWidget::KviTopicLabelLookOptionsWidget(QWidget *p):KviOp
 	layout()->setRowStretch(3, 1);
 }
 
-KviTopicLabelLookOptionsWidget::~KviTopicLabelLookOptionsWidget()
+OptionsWidget_topicLabel::~OptionsWidget_topicLabel()
 {
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_topiclabel.moc"
+#include "m_OptionsWidget_topicLabel.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_topiclabel.h b/src/modules/options/OptionsWidget_topicLabel.h
index 3f3690525..4f6c64f40 100644
--- a/src/modules/options/optw_topiclabel.h
+++ b/src/modules/options/OptionsWidget_topicLabel.h
@@ -2,7 +2,7 @@
 #define _OPTW_TOPICLABEL_H
 //=============================================================================
 //
-//   File : optw_topiclabel.h
+//   File : OptionsWidget_topicLabel.h
 //   Creation date : Mon Sep 24 02:44:55 CEST 2001 by Krzysztof Godlewski
 //
 //   This file is part of the KVIrc irc client distribution
@@ -33,12 +33,12 @@
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviTopicLabelLookOptionsWidget __tr2qs_no_lookup("theme,topic")
 #define KVI_OPTIONS_WIDGET_GROUP_KviTopicLabelLookOptionsWidget "theme"
 
-class KviTopicLabelLookOptionsWidget : public KviOptionsWidget
+class OptionsWidget_topicLabel : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviTopicLabelLookOptionsWidget(QWidget *);
-	~KviTopicLabelLookOptionsWidget();
+	OptionsWidget_topicLabel(QWidget *);
+	~OptionsWidget_topicLabel();
 };
 
 #endif // _OPTW_TOPICLABEL_H
diff --git a/src/modules/options/optw_tray.cpp b/src/modules/options/OptionsWidget_tray.cpp
index 992abe31c..49d54f1c6 100644
--- a/src/modules/options/optw_tray.cpp
+++ b/src/modules/options/OptionsWidget_tray.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_tray.cpp
+//   File : OptionsWidget_tray.cpp
 //   Creation date : Mon 14 Aug 2006 by Alexey Uzhva
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "optw_tray.h"
+#include "OptionsWidget_tray.h"
 
 #include "KviMainWindow.h"
 #include "KviInternalCommand.h"
@@ -33,7 +33,7 @@
 #include <QLayout>
 
 
-KviTrayOptionsWidget::KviTrayOptionsWidget(QWidget * parent)
+OptionsWidget_tray::OptionsWidget_tray(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("tray_options_widget");
@@ -63,11 +63,11 @@ KviTrayOptionsWidget::KviTrayOptionsWidget(QWidget * parent)
 	setEnabled(true);
 }
 
-KviTrayOptionsWidget::~KviTrayOptionsWidget()
+OptionsWidget_tray::~OptionsWidget_tray()
 {
 }
 
-void KviTrayOptionsWidget::setEnabled(bool)
+void OptionsWidget_tray::setEnabled(bool)
 {
 	if(m_pEnable->isChecked())
 	{
@@ -97,5 +97,5 @@ void KviTrayOptionsWidget::setEnabled(bool)
 
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_tray.moc"
+#include "m_OptionsWidget_tray.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_tray.h b/src/modules/options/OptionsWidget_tray.h
index 43dd4dcdf..8d79c8186 100644
--- a/src/modules/options/optw_tray.h
+++ b/src/modules/options/OptionsWidget_tray.h
@@ -2,7 +2,7 @@
 #define _OPTW_TRAY_H_
 //=============================================================================
 //
-//   File : optw_tray.cpp
+//   File : OptionsWidget_tray.cpp
 //   Creation date : Mon 14 Aug 2006 by Alexey Uzhva
 //
 //   This file is part of the KVIrc irc client distribution
@@ -30,15 +30,15 @@
 
 #define KVI_OPTIONS_WIDGET_ICON_KviTrayOptionsWidget KVI_SMALLICON_TRAYICON
 #define KVI_OPTIONS_WIDGET_NAME_KviTrayOptionsWidget __tr2qs_no_lookup("Tray icon")
-#define KVI_OPTIONS_WIDGET_PARENT_KviTrayOptionsWidget KviInterfaceFeaturesOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviTrayOptionsWidget OptionsWidget_interfaceFeatures
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviTrayOptionsWidget __tr2qs_no_lookup("tray,TRAYICON")
 
-class KviTrayOptionsWidget : public KviOptionsWidget
+class OptionsWidget_tray : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviTrayOptionsWidget(QWidget * parent);
-	~KviTrayOptionsWidget();
+	OptionsWidget_tray(QWidget * parent);
+	~OptionsWidget_tray();
 protected:
 	KviBoolSelector * m_pEnable;
 	KviBoolSelector * m_pEnableFlashing;
diff --git a/src/modules/options/optw_uparser.cpp b/src/modules/options/OptionsWidget_uparser.cpp
index 05fd1044f..88710b992 100644
--- a/src/modules/options/optw_uparser.cpp
+++ b/src/modules/options/OptionsWidget_uparser.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_uparser.cpp
+//   File : OptionsWidget_uparser.cpp
 //   Creation date : Sat Oct 27 16:32:26 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "optw_uparser.h"
+#include "OptionsWidget_uparser.h"
 
 #include "KviOptions.h"
 #include "KviLocale.h"
@@ -31,7 +31,7 @@
 #include <QLabel>
 
 
-KviUParserOptionsWidget::KviUParserOptionsWidget(QWidget * parent)
+OptionsWidget_uparser::OptionsWidget_uparser(QWidget * parent)
 : KviOptionsWidget(parent,"uparser_options_widget")
 {
 	createLayout();
@@ -54,11 +54,11 @@ KviUParserOptionsWidget::KviUParserOptionsWidget(QWidget * parent)
 	addRowSpacer(0,10,0,10);
 }
 
-KviUParserOptionsWidget::~KviUParserOptionsWidget()
+OptionsWidget_uparser::~OptionsWidget_uparser()
 {
 }
 
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_uparser.moc"
+#include "m_OptionsWidget_uparser.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_uparser.h b/src/modules/options/OptionsWidget_uparser.h
index 7ba0fc281..9b7009d43 100644
--- a/src/modules/options/optw_uparser.h
+++ b/src/modules/options/OptionsWidget_uparser.h
@@ -2,7 +2,7 @@
 #define _OPTW_UPARSER_H_
 //=============================================================================
 //
-//   File : optw_uparser.h
+//   File : OptionsWidget_uparser.h
 //   Creation date : Sat Oct 27 16:32:27 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -29,14 +29,14 @@
 #define KVI_OPTIONS_WIDGET_ICON_KviUParserOptionsWidget KVI_SMALLICON_PARSERWARNING
 #define KVI_OPTIONS_WIDGET_NAME_KviUParserOptionsWidget __tr2qs_no_lookup("Scripting Engine")
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviUParserOptionsWidget __tr2qs_no_lookup("scripting,kvs,debug")
-#define KVI_OPTIONS_WIDGET_PARENT_KviUParserOptionsWidget KviGeneralOptOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviUParserOptionsWidget OptionsWidget_general
 
-class KviUParserOptionsWidget : public KviOptionsWidget
+class OptionsWidget_uparser : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviUParserOptionsWidget(QWidget * parent);
-	~KviUParserOptionsWidget();
+	OptionsWidget_uparser(QWidget * parent);
+	~OptionsWidget_uparser();
 };
 
 #endif //_OPTW_UPARSER_H_
diff --git a/src/modules/options/optw_urlhandlers.cpp b/src/modules/options/OptionsWidget_urlHandlers.cpp
index aa56fbeb8..6651125e9 100644
--- a/src/modules/options/optw_urlhandlers.cpp
+++ b/src/modules/options/OptionsWidget_urlHandlers.cpp
@@ -2,7 +2,7 @@
 #define _OPTW_URLHANDLERS_CPP_
 //=============================================================================
 //
-//   File : optw_urlhandlers.cpp
+//   File : OptionsWidget_urlHandlers.cpp
 //   Creation date : Fri Aug 23 02:57:40 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -24,7 +24,7 @@
 //
 //=============================================================================
 
-#include "optw_urlhandlers.h"
+#include "OptionsWidget_urlHandlers.h"
 
 #include "KviOptions.h"
 #include "KviLocale.h"
@@ -34,7 +34,7 @@
 #include <QRadioButton>
 
 
-KviUrlHandlersOptionsWidget::KviUrlHandlersOptionsWidget(QWidget * parent)
+OptionsWidget_urlHandlers::OptionsWidget_urlHandlers(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
@@ -89,11 +89,11 @@ KviUrlHandlersOptionsWidget::KviUrlHandlersOptionsWidget(QWidget * parent)
 	addRowSpacer(0,START_ROW+6,0,START_ROW+6);
 }
 
-KviUrlHandlersOptionsWidget::~KviUrlHandlersOptionsWidget()
+OptionsWidget_urlHandlers::~OptionsWidget_urlHandlers()
 {
 }
 
-void KviUrlHandlersOptionsWidget::toggleEditors(bool bToggled)
+void OptionsWidget_urlHandlers::toggleEditors(bool bToggled)
 {
 	m_pHttpHandler->setEnabled(!bToggled);
 	m_pHttpsHandler->setEnabled(!bToggled);
@@ -103,7 +103,7 @@ void KviUrlHandlersOptionsWidget::toggleEditors(bool bToggled)
 	m_pOtherHandler->setEnabled(!bToggled);
 }
 
-void KviUrlHandlersOptionsWidget::commit()
+void OptionsWidget_urlHandlers::commit()
 {
 	KviOptionsWidget::commit();
 
@@ -148,7 +148,7 @@ void KviUrlHandlersOptionsWidget::commit()
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_urlhandlers.moc"
+#include "m_OptionsWidget_urlHandlers.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
 
 #endif //_OPTW_URLHANDLERS_CPP_
diff --git a/src/modules/options/optw_urlhandlers.h b/src/modules/options/OptionsWidget_urlHandlers.h
index ae7da9a11..99a5e0b9e 100644
--- a/src/modules/options/optw_urlhandlers.h
+++ b/src/modules/options/OptionsWidget_urlHandlers.h
@@ -2,7 +2,7 @@
 #define _OPTW_URLHANDLERS_H_
 //=============================================================================
 //
-//   File : optw_urlhandlers.h
+//   File : OptionsWidget_urlHandlers.h
 //   Creation date : Fri Aug 23 02:57:41 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -30,16 +30,16 @@ class QRadioButton;
 
 #define KVI_OPTIONS_WIDGET_ICON_KviUrlHandlersOptionsWidget KVI_SMALLICON_WORLD
 #define KVI_OPTIONS_WIDGET_NAME_KviUrlHandlersOptionsWidget __tr2qs_no_lookup("URL handlers")
-#define KVI_OPTIONS_WIDGET_PARENT_KviUrlHandlersOptionsWidget KviGeneralOptOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviUrlHandlersOptionsWidget OptionsWidget_general
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviUrlHandlersOptionsWidget 70000
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviUrlHandlersOptionsWidget __tr2qs_no_lookup("url,programs")
 
-class KviUrlHandlersOptionsWidget : public KviOptionsWidget
+class OptionsWidget_urlHandlers : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviUrlHandlersOptionsWidget(QWidget * parent);
-	~KviUrlHandlersOptionsWidget();
+	OptionsWidget_urlHandlers(QWidget * parent);
+	~OptionsWidget_urlHandlers();
 
 	virtual void commit();
 protected:
diff --git a/src/modules/options/optw_userlist.cpp b/src/modules/options/OptionsWidget_userList.cpp
index f1349e0ae..27a8d1344 100644
--- a/src/modules/options/optw_userlist.cpp
+++ b/src/modules/options/OptionsWidget_userList.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_userlist.cpp
+//   File : OptionsWidget_userList.cpp
 //   Creation date : Sat Aug 11 2001 03:29:52 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "optw_userlist.h"
+#include "OptionsWidget_userList.h"
 
 #include "KviOptions.h"
 #include "KviLocale.h"
@@ -30,12 +30,12 @@
 
 #include <QLayout>
 
-KviUserListLookOptionsWidget::KviUserListLookOptionsWidget(QWidget * parent)
+OptionsWidget_userList::OptionsWidget_userList(QWidget * parent)
 : KviOptionsWidget(parent,"userlistlook_options_widget")
 {
 }
 
-KviUserListLookOptionsWidget::~KviUserListLookOptionsWidget()
+OptionsWidget_userList::~OptionsWidget_userList()
 {
 }
 
@@ -44,7 +44,7 @@ KviUserListLookOptionsWidget::~KviUserListLookOptionsWidget()
 //////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviUserListLookForegroundOptionsWidget::KviUserListLookForegroundOptionsWidget(QWidget * parent)
+OptionsWidget_userListForeground::OptionsWidget_userListForeground(QWidget * parent)
 : KviOptionsWidget(parent,"userlistlook_foreground_options_widget")
 {
 	createLayout();
@@ -72,11 +72,11 @@ KviUserListLookForegroundOptionsWidget::KviUserListLookForegroundOptionsWidget(Q
 	addRowSpacer(0,3,0,3);
 }
 
-KviUserListLookForegroundOptionsWidget::~KviUserListLookForegroundOptionsWidget()
+OptionsWidget_userListForeground::~OptionsWidget_userListForeground()
 {
 }
 
-KviUserListGridOptionsWidget::KviUserListGridOptionsWidget(QWidget * parent)
+OptionsWidget_userListGrid::OptionsWidget_userListGrid(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	createLayout();
@@ -103,11 +103,11 @@ KviUserListGridOptionsWidget::KviUserListGridOptionsWidget(QWidget * parent)
 	addRowSpacer(0,3,0,3);
 }
 
-KviUserListGridOptionsWidget::~KviUserListGridOptionsWidget()
+OptionsWidget_userListGrid::~OptionsWidget_userListGrid()
 {
 }
 
-void KviUserListGridOptionsWidget::commit()
+void OptionsWidget_userListGrid::commit()
 {
 	KviOptionsWidget::commit();
 	KVI_OPTION_UINT(KviOption_uintUserListViewGridType) = m_pGridTypeCombo->currentIndex();
@@ -118,7 +118,7 @@ void KviUserListGridOptionsWidget::commit()
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////
 
-KviUserListLookBackgroundOptionsWidget::KviUserListLookBackgroundOptionsWidget(QWidget * parent)
+OptionsWidget_userListBackground::OptionsWidget_userListBackground(QWidget * parent)
 : KviOptionsWidget(parent,"userlistlook_background_options_widget")
 {
 	createLayout();
@@ -184,11 +184,11 @@ KviUserListLookBackgroundOptionsWidget::KviUserListLookBackgroundOptionsWidget(Q
 	layout()->setRowStretch(1,1);
 }
 
-KviUserListLookBackgroundOptionsWidget::~KviUserListLookBackgroundOptionsWidget()
+OptionsWidget_userListBackground::~OptionsWidget_userListBackground()
 {
 }
 
-void KviUserListLookBackgroundOptionsWidget::commit()
+void OptionsWidget_userListBackground::commit()
 {
 	KviOptionsWidget::commit();
 
@@ -224,7 +224,7 @@ void KviUserListLookBackgroundOptionsWidget::commit()
 //////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviUserListFeaturesOptionsWidget::KviUserListFeaturesOptionsWidget(QWidget * parent)
+OptionsWidget_userListFeatures::OptionsWidget_userListFeatures(QWidget * parent)
 : KviOptionsWidget(parent,"userlistfeatures_options_widget")
 {
 	createLayout();
@@ -241,10 +241,10 @@ KviUserListFeaturesOptionsWidget::KviUserListFeaturesOptionsWidget(QWidget * par
 	addRowSpacer(0,8,0,8);
 }
 
-KviUserListFeaturesOptionsWidget::~KviUserListFeaturesOptionsWidget()
+OptionsWidget_userListFeatures::~OptionsWidget_userListFeatures()
 {
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_userlist.moc"
+#include "m_OptionsWidget_userList.moc"
 #endif //COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_userlist.h b/src/modules/options/OptionsWidget_userList.h
index f250d89d9..63b0ceff3 100644
--- a/src/modules/options/optw_userlist.h
+++ b/src/modules/options/OptionsWidget_userList.h
@@ -2,7 +2,7 @@
 #define _OPTW_USERLIST_H_
 //=============================================================================
 //
-//   File : optw_userlist.h
+//   File : OptionsWidget_userList.h
 //   Creation date : Sat Mar 02 2002 12:09:19 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -34,28 +34,28 @@
 #define KVI_OPTIONS_WIDGET_GROUP_KviUserListLookOptionsWidget "theme"
 #define KVI_OPTIONS_WIDGET_CONTAINER_KviUserListLookOptionsWidget true
 
-class KviUserListLookOptionsWidget : public KviOptionsWidget
+class OptionsWidget_userList : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviUserListLookOptionsWidget(QWidget * parent);
-	~KviUserListLookOptionsWidget();
+	OptionsWidget_userList(QWidget * parent);
+	~OptionsWidget_userList();
 };
 
 #define KVI_OPTIONS_WIDGET_ICON_KviUserListLookBackgroundOptionsWidget KVI_SMALLICON_TRANSPARENT
 #define KVI_OPTIONS_WIDGET_NAME_KviUserListLookBackgroundOptionsWidget __tr2qs_no_lookup("Background")
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviUserListLookBackgroundOptionsWidget __tr2qs_no_lookup("theme,userlist,channel,background")
 #define KVI_OPTIONS_WIDGET_GROUP_KviUserListLookBackgroundOptionsWidget "theme"
-#define KVI_OPTIONS_WIDGET_PARENT_KviUserListLookBackgroundOptionsWidget KviUserListLookOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviUserListLookBackgroundOptionsWidget OptionsWidget_userList
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviUserListLookBackgroundOptionsWidget 30
 
 
-class KviUserListLookBackgroundOptionsWidget : public KviOptionsWidget
+class OptionsWidget_userListBackground : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviUserListLookBackgroundOptionsWidget(QWidget * parent);
-	~KviUserListLookBackgroundOptionsWidget();
+	OptionsWidget_userListBackground(QWidget * parent);
+	~OptionsWidget_userListBackground();
 protected:
 	QComboBox* m_pHorizontalAlign;
 	QComboBox* m_pVerticalAlign;
@@ -67,32 +67,32 @@ public:
 #define KVI_OPTIONS_WIDGET_NAME_KviUserListLookForegroundOptionsWidget __tr2qs_no_lookup("Foreground")
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviUserListLookForegroundOptionsWidget __tr2qs_no_lookup("theme,userlist,channel,colors")
 #define KVI_OPTIONS_WIDGET_GROUP_KviUserListLookForegroundOptionsWidget "theme"
-#define KVI_OPTIONS_WIDGET_PARENT_KviUserListLookForegroundOptionsWidget KviUserListLookOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviUserListLookForegroundOptionsWidget OptionsWidget_userList
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviUserListLookForegroundOptionsWidget 20
 
 
-class KviUserListLookForegroundOptionsWidget : public KviOptionsWidget
+class OptionsWidget_userListForeground : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviUserListLookForegroundOptionsWidget(QWidget * parent);
-	~KviUserListLookForegroundOptionsWidget();
+	OptionsWidget_userListForeground(QWidget * parent);
+	~OptionsWidget_userListForeground();
 };
 
 #define KVI_OPTIONS_WIDGET_ICON_KviUserListGridOptionsWidget KVI_SMALLICON_GUI
 #define KVI_OPTIONS_WIDGET_NAME_KviUserListGridOptionsWidget __tr2qs_no_lookup("Nickname Grid")
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviUserListGridOptionsWidget __tr2qs_no_lookup("theme,userlist,channel,grid")
 #define KVI_OPTIONS_WIDGET_GROUP_KviUserListGridOptionsWidget "theme"
-#define KVI_OPTIONS_WIDGET_PARENT_KviUserListGridOptionsWidget KviUserListLookOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviUserListGridOptionsWidget OptionsWidget_userList
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviUserListGridOptionsWidget 30
 
 
-class KviUserListGridOptionsWidget : public KviOptionsWidget
+class OptionsWidget_userListGrid : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviUserListGridOptionsWidget(QWidget * parent);
-	~KviUserListGridOptionsWidget();
+	OptionsWidget_userListGrid(QWidget * parent);
+	~OptionsWidget_userListGrid();
 protected:
 	QComboBox * m_pGridTypeCombo;
 public:
@@ -102,15 +102,15 @@ public:
 #define KVI_OPTIONS_WIDGET_ICON_KviUserListFeaturesOptionsWidget KVI_SMALLICON_GUI
 #define KVI_OPTIONS_WIDGET_NAME_KviUserListFeaturesOptionsWidget __tr2qs_no_lookup("Features")
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviUserListFeaturesOptionsWidget __tr2qs_no_lookup("userlist,channel")
-#define KVI_OPTIONS_WIDGET_PARENT_KviUserListFeaturesOptionsWidget KviUserListLookOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviUserListFeaturesOptionsWidget OptionsWidget_userList
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviUserListFeaturesOptionsWidget 10
 
-class KviUserListFeaturesOptionsWidget : public KviOptionsWidget
+class OptionsWidget_userListFeatures : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviUserListFeaturesOptionsWidget(QWidget * parent);
-	~KviUserListFeaturesOptionsWidget();
+	OptionsWidget_userListFeatures(QWidget * parent);
+	~OptionsWidget_userListFeatures();
 };
 
 #endif //!_OPTW_USERLIST_H_
diff --git a/src/modules/options/optw_windowlist.cpp b/src/modules/options/OptionsWidget_windowList.cpp
index d3cb828fa..53b61c8a9 100644
--- a/src/modules/options/optw_windowlist.cpp
+++ b/src/modules/options/OptionsWidget_windowList.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_windowlist.cpp
+//   File : OptionsWidget_windowList.cpp
 //   Creation date : Wed Jan 16 04:30:39 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,14 +22,14 @@
 //
 //=============================================================================
 
-#include "optw_windowlist.h"
+#include "OptionsWidget_windowList.h"
 
 #include "kvi_settings.h"
 #include "KviLocale.h"
 #include "KviOptions.h"
 
 
-KviWindowListOptionsWidget::KviWindowListOptionsWidget(QWidget * parent)
+OptionsWidget_windowList::OptionsWidget_windowList(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("windowlist_options_widget");
@@ -54,7 +54,7 @@ KviWindowListOptionsWidget::KviWindowListOptionsWidget(QWidget * parent)
 }
 
 
-KviWindowListOptionsWidget::~KviWindowListOptionsWidget()
+OptionsWidget_windowList::~OptionsWidget_windowList()
 {
 }
 
@@ -62,20 +62,20 @@ KviWindowListOptionsWidget::~KviWindowListOptionsWidget()
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviTreeWindowListOptionsWidget::KviTreeWindowListOptionsWidget(QWidget * parent)
+OptionsWidget_windowListTree::OptionsWidget_windowListTree(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("treewindowlist_options_widget");
 }
 
-KviTreeWindowListOptionsWidget::~KviTreeWindowListOptionsWidget()
+OptionsWidget_windowListTree::~OptionsWidget_windowListTree()
 {
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviTreeWindowListForegroundOptionsWidget::KviTreeWindowListForegroundOptionsWidget(QWidget * parent)
+OptionsWidget_windowListTreeForeground::OptionsWidget_windowListTreeForeground(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("treewindowlist_options_widget");
@@ -100,7 +100,7 @@ KviTreeWindowListForegroundOptionsWidget::KviTreeWindowListForegroundOptionsWidg
 }
 
 
-KviTreeWindowListForegroundOptionsWidget::~KviTreeWindowListForegroundOptionsWidget()
+OptionsWidget_windowListTreeForeground::~OptionsWidget_windowListTreeForeground()
 {
 }
 
@@ -109,7 +109,7 @@ KviTreeWindowListForegroundOptionsWidget::~KviTreeWindowListForegroundOptionsWid
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviTreeWindowListBackgroundOptionsWidget::KviTreeWindowListBackgroundOptionsWidget(QWidget * parent)
+OptionsWidget_windowListTreeBackground::OptionsWidget_windowListTreeBackground(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("treewindowlist_options_widget");
@@ -174,11 +174,11 @@ KviTreeWindowListBackgroundOptionsWidget::KviTreeWindowListBackgroundOptionsWidg
 }
 
 
-KviTreeWindowListBackgroundOptionsWidget::~KviTreeWindowListBackgroundOptionsWidget()
+OptionsWidget_windowListTreeBackground::~OptionsWidget_windowListTreeBackground()
 {
 }
 
-void KviTreeWindowListBackgroundOptionsWidget::commit()
+void OptionsWidget_windowListTreeBackground::commit()
 {
 	KviOptionsWidget::commit();
 
@@ -213,7 +213,7 @@ void KviTreeWindowListBackgroundOptionsWidget::commit()
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-KviTreeWindowListFeaturesOptionsWidget::KviTreeWindowListFeaturesOptionsWidget(QWidget * parent)
+OptionsWidget_windowListTreeFeatures::OptionsWidget_windowListTreeFeatures(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("treewindowlist_options_widget");
@@ -227,14 +227,14 @@ KviTreeWindowListFeaturesOptionsWidget::KviTreeWindowListFeaturesOptionsWidget(Q
 }
 
 
-KviTreeWindowListFeaturesOptionsWidget::~KviTreeWindowListFeaturesOptionsWidget()
+OptionsWidget_windowListTreeFeatures::~OptionsWidget_windowListTreeFeatures()
 {
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviClassicWindowListOptionsWidget::KviClassicWindowListOptionsWidget(QWidget * parent)
+OptionsWidget_windowListClassic::OptionsWidget_windowListClassic(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("classicwindowlist_options_widget");
@@ -260,10 +260,10 @@ KviClassicWindowListOptionsWidget::KviClassicWindowListOptionsWidget(QWidget * p
 }
 
 
-KviClassicWindowListOptionsWidget::~KviClassicWindowListOptionsWidget()
+OptionsWidget_windowListClassic::~OptionsWidget_windowListClassic()
 {
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_windowlist.moc"
+#include "m_OptionsWidget_windowList.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_windowlist.h b/src/modules/options/OptionsWidget_windowList.h
index 663de7961..4eb29217b 100644
--- a/src/modules/options/optw_windowlist.h
+++ b/src/modules/options/OptionsWidget_windowList.h
@@ -3,7 +3,7 @@
 
 //===============================================================================
 //
-//   File : optw_windowlist.h
+//   File : OptionsWidget_windowList.h
 //   Creation date : Wed Jan 16 04:30:41 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -36,91 +36,91 @@
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviWindowListOptionsWidget __tr2qs_no_lookup("theme")
 #define KVI_OPTIONS_WIDGET_GROUP_KviWindowListOptionsWidget "theme"
 
-class KviWindowListOptionsWidget : public KviOptionsWidget
+class OptionsWidget_windowList : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviWindowListOptionsWidget(QWidget * parent);
-	~KviWindowListOptionsWidget();
+	OptionsWidget_windowList(QWidget * parent);
+	~OptionsWidget_windowList();
 };
 
 #define KVI_OPTIONS_WIDGET_ICON_KviTreeWindowListOptionsWidget KVI_SMALLICON_TREEWINDOWLIST
 #define KVI_OPTIONS_WIDGET_NAME_KviTreeWindowListOptionsWidget __tr2qs_no_lookup("Tree Window List")
-#define KVI_OPTIONS_WIDGET_PARENT_KviTreeWindowListOptionsWidget KviWindowListOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviTreeWindowListOptionsWidget OptionsWidget_windowList
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeWindowListOptionsWidget __tr2qs_no_lookup("theme")
 #define KVI_OPTIONS_WIDGET_GROUP_KviTreeWindowListOptionsWidget "theme"
 #define KVI_OPTIONS_WIDGET_CONTAINER_KviTreeWindowListOptionsWidget true
 
-class KviTreeWindowListOptionsWidget : public KviOptionsWidget
+class OptionsWidget_windowListTree : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviTreeWindowListOptionsWidget(QWidget * pParent);
-	~KviTreeWindowListOptionsWidget();
+	OptionsWidget_windowListTree(QWidget * pParent);
+	~OptionsWidget_windowListTree();
 };
 
 
 #define KVI_OPTIONS_WIDGET_ICON_KviTreeWindowListForegroundOptionsWidget KVI_SMALLICON_TREEWINDOWLIST
 #define KVI_OPTIONS_WIDGET_NAME_KviTreeWindowListForegroundOptionsWidget __tr2qs_no_lookup("Foreground")
-#define KVI_OPTIONS_WIDGET_PARENT_KviTreeWindowListForegroundOptionsWidget KviTreeWindowListOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviTreeWindowListForegroundOptionsWidget OptionsWidget_windowListTree
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeTaskForegroundBarOptionsWidget __tr2qs_no_lookup("theme")
 #define KVI_OPTIONS_WIDGET_GROUP_KviTreeWindowListForegroundOptionsWidget "theme"
 
-class KviTreeWindowListForegroundOptionsWidget : public KviOptionsWidget
+class OptionsWidget_windowListTreeForeground : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviTreeWindowListForegroundOptionsWidget(QWidget * parent);
-	~KviTreeWindowListForegroundOptionsWidget();
+	OptionsWidget_windowListTreeForeground(QWidget * parent);
+	~OptionsWidget_windowListTreeForeground();
 };
 
 
 #define KVI_OPTIONS_WIDGET_ICON_KviTreeWindowListBackgroundOptionsWidget KVI_SMALLICON_TREEWINDOWLIST
 #define KVI_OPTIONS_WIDGET_NAME_KviTreeWindowListBackgroundOptionsWidget __tr2qs_no_lookup("Background")
-#define KVI_OPTIONS_WIDGET_PARENT_KviTreeWindowListBackgroundOptionsWidget KviTreeWindowListOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviTreeWindowListBackgroundOptionsWidget OptionsWidget_windowListTree
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeTaskBackgroundBarOptionsWidget __tr2qs_no_lookup("theme")
 #define KVI_OPTIONS_WIDGET_GROUP_KviTreeWindowListBackgroundOptionsWidget "theme"
 
-class KviTreeWindowListBackgroundOptionsWidget : public KviOptionsWidget
+class OptionsWidget_windowListTreeBackground : public KviOptionsWidget
 {
 	Q_OBJECT
 private:
 	QComboBox* m_pHorizontalAlign;
 	QComboBox* m_pVerticalAlign;
 public:
-	KviTreeWindowListBackgroundOptionsWidget(QWidget * parent);
-	~KviTreeWindowListBackgroundOptionsWidget();
+	OptionsWidget_windowListTreeBackground(QWidget * parent);
+	~OptionsWidget_windowListTreeBackground();
 
 	virtual void commit();
 };
 
 #define KVI_OPTIONS_WIDGET_ICON_KviTreeWindowListFeaturesOptionsWidget KVI_SMALLICON_TREEWINDOWLIST
 #define KVI_OPTIONS_WIDGET_NAME_KviTreeWindowListFeaturesOptionsWidget __tr2qs_no_lookup("Features")
-#define KVI_OPTIONS_WIDGET_PARENT_KviTreeWindowListFeaturesOptionsWidget KviTreeWindowListOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviTreeWindowListFeaturesOptionsWidget OptionsWidget_windowListTree
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeTaskFeaturesBarOptionsWidget __tr2qs_no_lookup("theme")
 #define KVI_OPTIONS_WIDGET_GROUP_KviTreeWindowListFeaturesOptionsWidget "theme"
 
-class KviTreeWindowListFeaturesOptionsWidget : public KviOptionsWidget
+class OptionsWidget_windowListTreeFeatures : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviTreeWindowListFeaturesOptionsWidget(QWidget * parent);
-	~KviTreeWindowListFeaturesOptionsWidget();
+	OptionsWidget_windowListTreeFeatures(QWidget * parent);
+	~OptionsWidget_windowListTreeFeatures();
 };
 
 #define KVI_OPTIONS_WIDGET_ICON_KviClassicWindowListOptionsWidget KVI_SMALLICON_CLASSICWINDOWLIST
 #define KVI_OPTIONS_WIDGET_NAME_KviClassicWindowListOptionsWidget __tr2qs_no_lookup("Classic Window List")
-#define KVI_OPTIONS_WIDGET_PARENT_KviClassicWindowListOptionsWidget KviWindowListOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviClassicWindowListOptionsWidget OptionsWidget_windowList
 #define KVI_OPTIONS_WIDGET_MINIMAL_USER_EXPERIENCE_LEVEL_KviClassicWindowListOptionsWidget 2
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviClassicWindowListOptionsWidget __tr2qs_no_lookup("theme")
 #define KVI_OPTIONS_WIDGET_GROUP_KviClassicWindowListOptionsWidget "theme"
 
-class KviClassicWindowListOptionsWidget : public KviOptionsWidget
+class OptionsWidget_windowListClassic : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviClassicWindowListOptionsWidget(QWidget * parent);
-	~KviClassicWindowListOptionsWidget();
+	OptionsWidget_windowListClassic(QWidget * parent);
+	~OptionsWidget_windowListClassic();
 };
 
 #endif //_OPTW_WINDOWLIST_H_
diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp
index 9e323587a..e80cab7a6 100644
--- a/src/modules/options/dialog.cpp
+++ b/src/modules/options/dialog.cpp
@@ -53,12 +53,12 @@
 
 
 //extern KviModule * g_pOptionsModule;
-extern KviPointerHashTable<QString,KviOptionsDialog> * g_pOptionsDialogDict;
+extern KviPointerHashTable<QString,OptionsDialog> * g_pOptionsDialogDict;
 
 extern KVIRC_API KviApplication * g_pApp;
-extern KviOptionsInstanceManager * g_pOptionsInstanceManager;
+extern OptionsInstanceManager * g_pOptionsInstanceManager;
 
-KviGeneralOptionsFrontWidget::KviGeneralOptionsFrontWidget(QWidget *parent,const QString &szText)
+OptionsDialogFrontWidget::OptionsDialogFrontWidget(QWidget *parent,const QString &szText)
 :KviOptionsWidget(parent)
 {
 	setObjectName("general_options_front_widget");
@@ -69,12 +69,12 @@ KviGeneralOptionsFrontWidget::KviGeneralOptionsFrontWidget(QWidget *parent,const
 	layout()->addWidget(l,0,0);
 }
 
-KviGeneralOptionsFrontWidget::~KviGeneralOptionsFrontWidget()
+OptionsDialogFrontWidget::~OptionsDialogFrontWidget()
 {
 }
 
 
-KviOptionsTreeWidgetItem::KviOptionsTreeWidgetItem(QTreeWidget *parent,KviOptionsWidgetInstanceEntry * e)
+OptionsDialogTreeWidgetItem::OptionsDialogTreeWidgetItem(QTreeWidget *parent,OptionsWidgetInstanceEntry * e)
 :QTreeWidgetItem()
 {
 	m_pInstanceEntry = e;
@@ -84,7 +84,7 @@ KviOptionsTreeWidgetItem::KviOptionsTreeWidgetItem(QTreeWidget *parent,KviOption
 	parent->insertTopLevelItem(0, this);
 }
 
-KviOptionsTreeWidgetItem::KviOptionsTreeWidgetItem(QTreeWidgetItem *parent,KviOptionsWidgetInstanceEntry * e)
+OptionsDialogTreeWidgetItem::OptionsDialogTreeWidgetItem(QTreeWidgetItem *parent,OptionsWidgetInstanceEntry * e)
 :QTreeWidgetItem()
 {
 	m_pInstanceEntry = e;
@@ -94,11 +94,11 @@ KviOptionsTreeWidgetItem::KviOptionsTreeWidgetItem(QTreeWidgetItem *parent,KviOp
 	parent->insertChild(0, this);
 }
 
-KviOptionsTreeWidgetItem::~KviOptionsTreeWidgetItem()
+OptionsDialogTreeWidgetItem::~OptionsDialogTreeWidgetItem()
 {
 }
 
-KviOptionsDialog::KviOptionsDialog(QWidget * par,const QString &szGroup)
+OptionsDialog::OptionsDialog(QWidget * par,const QString &szGroup)
 : QWidget(par)
 {
 	setObjectName("general_options_dialog");
@@ -219,7 +219,7 @@ KviOptionsDialog::KviOptionsDialog(QWidget * par,const QString &szGroup)
 	vbox->setStretchFactor(m_pWidgetStack,1);
 
 	// First widget visible
-	m_pFrontWidget = new KviGeneralOptionsFrontWidget(m_pWidgetStack,szFrontText);
+	m_pFrontWidget = new OptionsDialogFrontWidget(m_pWidgetStack,szFrontText);
 	m_pWidgetStack->addWidget(m_pFrontWidget);
 
 	int idx = m_pWidgetStack->indexOf(m_pFrontWidget);
@@ -272,7 +272,7 @@ KviOptionsDialog::KviOptionsDialog(QWidget * par,const QString &szGroup)
 	new QShortcut(Qt::Key_Escape,this,SLOT(close()));
 }
 
-KviOptionsDialog::~KviOptionsDialog()
+OptionsDialog::~OptionsDialog()
 {
 	if(!parent())KVI_OPTION_RECT(KviOption_rectGeneralOptionsDialogGeometry) = QRect(pos().x(),pos().y(),
 			size().width(),size().height());
@@ -280,7 +280,7 @@ KviOptionsDialog::~KviOptionsDialog()
 		g_pOptionsDialogDict->remove(m_szGroup);
 }
 
-void KviOptionsDialog::showEvent(QShowEvent *e)
+void OptionsDialog::showEvent(QShowEvent *e)
 {
 	QRect r = g_pApp->desktop()->screenGeometry(g_pApp->desktop()->primaryScreen());
 
@@ -303,12 +303,12 @@ void KviOptionsDialog::showEvent(QShowEvent *e)
 	QWidget::showEvent(e);
 }
 
-void KviOptionsDialog::searchLineEditTextChanged(const QString &)
+void OptionsDialog::searchLineEditTextChanged(const QString &)
 {
 	QString txt = m_pSearchLineEdit->text().trimmed();
 	m_pSearchButton->setEnabled(txt.length() > 0);
 }
-bool KviOptionsDialog::searchInSelectors(KviOptionsWidget *pOptionsWidget,const QStringList &lKeywords)
+bool OptionsDialog::searchInSelectors(KviOptionsWidget *pOptionsWidget,const QStringList &lKeywords)
 {
 	KviPointerList<KviSelectorInterface> *selectors=pOptionsWidget->selectors();
 	bool bFoundSomethingHere=false;
@@ -347,7 +347,7 @@ bool KviOptionsDialog::searchInSelectors(KviOptionsWidget *pOptionsWidget,const
 	return bFoundSomethingHere;
 }
 
-bool KviOptionsDialog::recursiveSearch(KviOptionsTreeWidgetItem * pItem,const QStringList &lKeywords)
+bool OptionsDialog::recursiveSearch(OptionsDialogTreeWidgetItem * pItem,const QStringList &lKeywords)
 {
 	if(!pItem)return false;
 	if(!pItem->m_pOptionsWidget)
@@ -399,7 +399,7 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsTreeWidgetItem * pItem,const QS
 	{
 		for(int j=0;j<ccount;j++)
 		{
-			KviOptionsTreeWidgetItem * pChild = (KviOptionsTreeWidgetItem *)pItem->child(j);
+			OptionsDialogTreeWidgetItem * pChild = (OptionsDialogTreeWidgetItem *)pItem->child(j);
 			bool bRet = recursiveSearch(pChild,lKeywords);
 			if(bRet)bFoundSomethingInside = true;
 		}
@@ -410,41 +410,41 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsTreeWidgetItem * pItem,const QS
 	return (bFoundSomethingInside || bFoundSomethingHere);
 }
 
-void KviOptionsDialog::search(const QStringList &lKeywords)
+void OptionsDialog::search(const QStringList &lKeywords)
 {
 	m_pTreeWidget->setUpdatesEnabled(false);
 
 	int count=m_pTreeWidget->topLevelItemCount();
 	for (int i=0;i<count;i++)
 	{
-		KviOptionsTreeWidgetItem * pChild = (KviOptionsTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
+		OptionsDialogTreeWidgetItem * pChild = (OptionsDialogTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
 		recursiveSearch(pChild,lKeywords);
 	}
 	m_pTreeWidget->setUpdatesEnabled(true);
 	m_pTreeWidget->update();
 }
 
-void KviOptionsDialog::search(const QString &szKeywords)
+void OptionsDialog::search(const QString &szKeywords)
 {
 	QStringList lKeywords = szKeywords.split(" ",QString::SkipEmptyParts);
 	search(lKeywords);
 }
 
-void KviOptionsDialog::searchClicked()
+void OptionsDialog::searchClicked()
 {
 	QString szTxt = m_pSearchLineEdit->text().trimmed();
 	if(!szTxt.isEmpty())
 		search(szTxt);
 }
 
-void KviOptionsDialog::fillTreeWidget(QTreeWidgetItem * p,KviPointerList<KviOptionsWidgetInstanceEntry> * l,const QString &szGroup,bool bNotContainedOnly)
+void OptionsDialog::fillTreeWidget(QTreeWidgetItem * p,KviPointerList<OptionsWidgetInstanceEntry> * l,const QString &szGroup,bool bNotContainedOnly)
 {
 	if(!l)return;
 
-	KviOptionsTreeWidgetItem * it;
-	KviOptionsWidgetInstanceEntry * e;
+	OptionsDialogTreeWidgetItem * it;
+	OptionsWidgetInstanceEntry * e;
 
-	KviPointerList<KviOptionsWidgetInstanceEntry> tmp;
+	KviPointerList<OptionsWidgetInstanceEntry> tmp;
 	tmp.setAutoDelete(false);
 
 
@@ -453,7 +453,7 @@ void KviOptionsDialog::fillTreeWidget(QTreeWidgetItem * p,KviPointerList<KviOpti
 		// must be in the correct group
 		// if we want only containers then well.. must be one
 		e->bDoInsert = KviQString::equalCI(szGroup,e->szGroup) && ((!bNotContainedOnly) || e->bIsContainer || e->bIsNotContained);
-		KviOptionsWidgetInstanceEntry * ee = tmp.first();
+		OptionsWidgetInstanceEntry * ee = tmp.first();
 		int idx = 0;
 		while(ee)
 		{
@@ -468,8 +468,8 @@ void KviOptionsDialog::fillTreeWidget(QTreeWidgetItem * p,KviPointerList<KviOpti
 	{
 		if(e->bDoInsert)
 		{
-			if(p)it = new KviOptionsTreeWidgetItem(p,e);
-			else it = new KviOptionsTreeWidgetItem(m_pTreeWidget,e);
+			if(p)it = new OptionsDialogTreeWidgetItem(p,e);
+			else it = new OptionsDialogTreeWidgetItem(m_pTreeWidget,e);
 			if(!it->m_pOptionsWidget)
 			{
 				it->m_pOptionsWidget = g_pOptionsInstanceManager->getInstance(it->m_pInstanceEntry,m_pWidgetStack);
@@ -478,7 +478,7 @@ void KviOptionsDialog::fillTreeWidget(QTreeWidgetItem * p,KviPointerList<KviOpti
 					m_pWidgetStack->addWidget(it->m_pOptionsWidget);
 			}
 		} else {
-			it = (KviOptionsTreeWidgetItem *)p;
+			it = (OptionsDialogTreeWidgetItem *)p;
 		}
 
 		if(e->pChildList)
@@ -495,7 +495,7 @@ void KviOptionsDialog::fillTreeWidget(QTreeWidgetItem * p,KviPointerList<KviOpti
 	}
 }
 
-void KviOptionsDialog::treeWidgetItemSelectionChanged(QTreeWidgetItem* it, QTreeWidgetItem *)
+void OptionsDialog::treeWidgetItemSelectionChanged(QTreeWidgetItem* it, QTreeWidgetItem *)
 {
 	if(it)
 	{
@@ -511,7 +511,7 @@ void KviOptionsDialog::treeWidgetItemSelectionChanged(QTreeWidgetItem* it, QTree
 		str.prepend("<b>");
 		str += "</b>";
 
-		KviOptionsTreeWidgetItem *i = (KviOptionsTreeWidgetItem *)it;
+		OptionsDialogTreeWidgetItem *i = (OptionsDialogTreeWidgetItem *)it;
 		if(!i->m_pOptionsWidget)
 		{
 			i->m_pOptionsWidget = g_pOptionsInstanceManager->getInstance(i->m_pInstanceEntry,m_pWidgetStack);
@@ -525,18 +525,18 @@ void KviOptionsDialog::treeWidgetItemSelectionChanged(QTreeWidgetItem* it, QTree
 }
 
 /*
-KviOptionsTreeWidgetItem * KviOptionsDialog::findItemByPage(KviOptionsTreeWidgetItem *it,KviOptionsWidget * pPage)
+OptionsDialogTreeWidgetItem * OptionsDialog::findItemByPage(OptionsDialogTreeWidgetItem *it,KviOptionsWidget * pPage)
 {
 	if(!it)return 0;
 	if(it->m_pOptionsWidget == pPage)return it;
 
-	KviOptionsTreeWidgetItem *i;
+	OptionsDialogTreeWidgetItem *i;
 
 	int ccount = it->childCount();
 
 	for(int j=0;j<ccount;j++)
 	{
-		KviOptionsTreeWidgetItem * i = (KviOptionsTreeWidgetItem *)it->child(j);
+		OptionsDialogTreeWidgetItem * i = (OptionsDialogTreeWidgetItem *)it->child(j);
 
 		i = findItemByPage(i,pPage);
 		if(i)return i;
@@ -545,13 +545,13 @@ KviOptionsTreeWidgetItem * KviOptionsDialog::findItemByPage(KviOptionsTreeWidget
 	// not found in the children tree.. look in the next sibling
 	for(int j=0;j<ccount;j++)
 	{
-		KviOptionsTreeWidgetItem * pChild = (KviOptionsTreeWidgetItem *)pItem->child(j);
+		OptionsDialogTreeWidgetItem * pChild = (OptionsDialogTreeWidgetItem *)pItem->child(j);
 
 		i = findItemByPage(i,pPage);
 		if(i)return i;
 	}
 
-	i = (KviOptionsTreeWidgetItem *)(it->nextSibling());
+	i = (OptionsDialogTreeWidgetItem *)(it->nextSibling());
 	if(i)
 	{
 		i = findItemByPage(i,pPage);
@@ -560,26 +560,26 @@ KviOptionsTreeWidgetItem * KviOptionsDialog::findItemByPage(KviOptionsTreeWidget
 	return 0;
 }
 */
-void KviOptionsDialog::pageWantsToSwitchToAdvancedPage(KviOptionsWidget *)
+void OptionsDialog::pageWantsToSwitchToAdvancedPage(KviOptionsWidget *)
 {
 	// unused
 }
 
-void KviOptionsDialog::applyClicked()
+void OptionsDialog::applyClicked()
 {
 	apply(false);
 }
 
-void KviOptionsDialog::apply(bool bDialogAboutToClose)
+void OptionsDialog::apply(bool bDialogAboutToClose)
 {
 	int count=m_pTreeWidget->topLevelItemCount();
 	int curTab=-1;
-	KviOptionsTreeWidgetItem * it;
+	OptionsDialogTreeWidgetItem * it;
 
 	if(!bDialogAboutToClose)
 	{
 		// bring up the current widget again!
-		it = (KviOptionsTreeWidgetItem *)m_pTreeWidget->currentItem();
+		it = (OptionsDialogTreeWidgetItem *)m_pTreeWidget->currentItem();
 		//checking if the check of the check is checkable
 		if(it)
 			if(it->m_pOptionsWidget)
@@ -589,14 +589,14 @@ void KviOptionsDialog::apply(bool bDialogAboutToClose)
 
 	for (int i=0;i<count;i++)
 	{
-		it = (KviOptionsTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
+		it = (OptionsDialogTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
 		recursiveCommit(it);
 	}
 
 	if(!bDialogAboutToClose)
 	{
 		// bring up the current widget again!
-		it = (KviOptionsTreeWidgetItem *)m_pTreeWidget->currentItem();
+		it = (OptionsDialogTreeWidgetItem *)m_pTreeWidget->currentItem();
 		if(it)
 		{
 			treeWidgetItemSelectionChanged(it, 0);
@@ -610,31 +610,31 @@ void KviOptionsDialog::apply(bool bDialogAboutToClose)
 
 }
 
-void KviOptionsDialog::okClicked()
+void OptionsDialog::okClicked()
 {
 	apply(true);
 	deleteLater();
 }
 
-void KviOptionsDialog::cancelClicked()
+void OptionsDialog::cancelClicked()
 {
 	deleteLater();
 }
 
-void KviOptionsDialog::closeEvent(QCloseEvent *e)
+void OptionsDialog::closeEvent(QCloseEvent *e)
 {
 	e->ignore();
 	deleteLater();
 }
 
-void KviOptionsDialog::recursiveCommit(KviOptionsTreeWidgetItem *it)
+void OptionsDialog::recursiveCommit(OptionsDialogTreeWidgetItem *it)
 {
 	// First commit the children
 	if(!it) return;
 	int count=it->childCount();
 	for (int i=0;i<count;i++)
 	{
-		KviOptionsTreeWidgetItem * pChild = (KviOptionsTreeWidgetItem *)it->child(i);
+		OptionsDialogTreeWidgetItem * pChild = (OptionsDialogTreeWidgetItem *)it->child(i);
 		recursiveCommit(pChild);
 	}
 
@@ -648,7 +648,7 @@ void KviOptionsDialog::recursiveCommit(KviOptionsTreeWidgetItem *it)
 	//refreshTreeWidget(); // <-- this tends to jump into infinite recursion
 }
 
-void  KviOptionsDialog::keyPressEvent( QKeyEvent * e )
+void  OptionsDialog::keyPressEvent( QKeyEvent * e )
 {
 	if(e->key()==Qt::Key_Return)
 		e->accept();
diff --git a/src/modules/options/dialog.h b/src/modules/options/dialog.h
index a867182b8..67b92fc84 100644
--- a/src/modules/options/dialog.h
+++ b/src/modules/options/dialog.h
@@ -25,7 +25,7 @@
 //
 //=============================================================================
 
-#include "instances.h"
+#include "OptionsInstanceManager.h"
 
 #include "KviOptionsWidget.h"
 #include <QTreeWidget>
@@ -41,44 +41,44 @@ class QPushButton;
 class QLineEdit;
 class QStackedWidget;
 
-class KviGeneralOptionsFrontWidget : public KviOptionsWidget
+class OptionsDialogFrontWidget : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviGeneralOptionsFrontWidget(QWidget *parent,const QString &szText);
-	~KviGeneralOptionsFrontWidget();
+	OptionsDialogFrontWidget(QWidget *parent,const QString &szText);
+	~OptionsDialogFrontWidget();
 };
 
-class KviOptionsTreeWidgetItem : public QTreeWidgetItem
+class OptionsDialogTreeWidgetItem : public QTreeWidgetItem
 {
 public:
-	KviOptionsTreeWidgetItem(QTreeWidget *parent,KviOptionsWidgetInstanceEntry * e);
-	KviOptionsTreeWidgetItem(QTreeWidgetItem *parent,KviOptionsWidgetInstanceEntry * e);
-	~KviOptionsTreeWidgetItem();
+	OptionsDialogTreeWidgetItem(QTreeWidget *parent,OptionsWidgetInstanceEntry * e);
+	OptionsDialogTreeWidgetItem(QTreeWidgetItem *parent,OptionsWidgetInstanceEntry * e);
+	~OptionsDialogTreeWidgetItem();
 public:
-	KviOptionsWidgetInstanceEntry * m_pInstanceEntry;
+	OptionsWidgetInstanceEntry * m_pInstanceEntry;
 	KviOptionsWidget              * m_pOptionsWidget;
 };
 
-class KviOptionsDialog : public QWidget
+class OptionsDialog : public QWidget
 {
 	Q_OBJECT
 public:
-	KviOptionsDialog(QWidget * par,const QString &szGroup);
-	~KviOptionsDialog();
+	OptionsDialog(QWidget * par,const QString &szGroup);
+	~OptionsDialog();
 private:
 	QTreeWidget                  * m_pTreeWidget;
 	QLabel                       * m_pCategoryLabel;
 	QStackedWidget               * m_pWidgetStack;
-	KviGeneralOptionsFrontWidget * m_pFrontWidget;
+	OptionsDialogFrontWidget * m_pFrontWidget;
 	QString                        m_szGroup;
 	QLineEdit                    * m_pSearchLineEdit;
 	QToolButton                  * m_pSearchButton;
 private:
-	void recursiveCommit(KviOptionsTreeWidgetItem *it);
-	void fillTreeWidget(QTreeWidgetItem * p,KviPointerList<KviOptionsWidgetInstanceEntry> * l,const QString &szGroup,bool bNotContainedOnly = false);
-	//KviOptionsTreeWidgetItem * showHiddenChildren(QTreeWidgetItem * p,KviPointerList<KviOptionsWidgetInstanceEntry> * l);
-	//KviOptionsTreeWidgetItem * findItemByPage(KviOptionsTreeWidgetItem *it,KviOptionsWidget * pPage);
+	void recursiveCommit(OptionsDialogTreeWidgetItem *it);
+	void fillTreeWidget(QTreeWidgetItem * p,KviPointerList<OptionsWidgetInstanceEntry> * l,const QString &szGroup,bool bNotContainedOnly = false);
+	//OptionsDialogTreeWidgetItem * showHiddenChildren(QTreeWidgetItem * p,KviPointerList<OptionsWidgetInstanceEntry> * l);
+	//OptionsDialogTreeWidgetItem * findItemByPage(OptionsDialogTreeWidgetItem *it,KviOptionsWidget * pPage);
 private slots:
 	void treeWidgetItemSelectionChanged(QTreeWidgetItem* it, QTreeWidgetItem *prev);
 	void applyClicked();
@@ -92,7 +92,7 @@ protected:
 	virtual void closeEvent(QCloseEvent *e);
 	virtual void keyPressEvent( QKeyEvent * e );
 	virtual void showEvent(QShowEvent *e);
-	bool recursiveSearch(KviOptionsTreeWidgetItem * pItem,const QStringList &lKeywords);
+	bool recursiveSearch(OptionsDialogTreeWidgetItem * pItem,const QStringList &lKeywords);
 	bool searchInSelectors(KviOptionsWidget *pWidget,const QStringList &lKeywords);
 
 public:
diff --git a/src/modules/options/libkvioptions.cpp b/src/modules/options/libkvioptions.cpp
index 47c9793ed..6c8b8e9dc 100644
--- a/src/modules/options/libkvioptions.cpp
+++ b/src/modules/options/libkvioptions.cpp
@@ -22,8 +22,8 @@
 //
 //=============================================================================
 
-#include "container.h"
-#include "instances.h"
+#include "OptionsWidgetContainer.h"
+#include "OptionsInstanceManager.h"
 #include "dialog.h"
 
 #include "KviModule.h"
@@ -39,9 +39,9 @@
 
 #include <QSplitter>
 
-KviPointerHashTable<QString,KviOptionsDialog> * g_pOptionsDialogDict = 0;
+KviPointerHashTable<QString,OptionsDialog> * g_pOptionsDialogDict = 0;
 
-KviOptionsInstanceManager * g_pOptionsInstanceManager = 0;
+OptionsInstanceManager * g_pOptionsInstanceManager = 0;
 
 extern int g_iOptionWidgetInstances;
 
@@ -101,7 +101,7 @@ static bool options_kvs_cmd_dialog(KviKvsModuleCommandCall * c)
 		KVSM_PARAMETER("options_group",KVS_PT_STRING,KVS_PF_OPTIONAL,szGroup)
 	KVSM_PARAMETERS_END(c)
 	if(szGroup.isEmpty())szGroup = "general";
-	KviOptionsDialog * d = g_pOptionsDialogDict->find(szGroup);
+	OptionsDialog * d = g_pOptionsDialogDict->find(szGroup);
 	if(d)
 	{
 		if(c->hasSwitch('t',"toplevel"))
@@ -122,9 +122,9 @@ static bool options_kvs_cmd_dialog(KviKvsModuleCommandCall * c)
 	} else {
 		if(c->hasSwitch('t',"toplevel"))
 		{
-			d = new KviOptionsDialog(0,szGroup);
+			d = new OptionsDialog(0,szGroup);
 		} else {
-			d = new KviOptionsDialog(c->window()->frame()->splitter(),szGroup);
+			d = new OptionsDialog(c->window()->frame()->splitter(),szGroup);
 		}
 		g_pOptionsDialogDict->insert(szGroup,d);
 	}
@@ -150,14 +150,14 @@ static bool options_kvs_cmd_dialog(KviKvsModuleCommandCall * c)
 */
 
 
-static void options_kvs_module_print_pages(KviKvsModuleCommandCall * c,KviOptionsWidgetInstanceEntry * e,const char * prefix)
+static void options_kvs_module_print_pages(KviKvsModuleCommandCall * c,OptionsWidgetInstanceEntry * e,const char * prefix)
 {
 	c->window()->output(KVI_OUT_SYSTEMMESSAGE,"%s%c%s%c  (%Q)",prefix,KviMircCntrl::Bold,e->szClassName,KviMircCntrl::Bold,&(e->szName));
 	KviCString szPre = prefix;
 	szPre.append("  ");
 	if(e->pChildList)
 	{
-		for(KviOptionsWidgetInstanceEntry * ex = e->pChildList->first();ex;ex = e->pChildList->next())
+		for(OptionsWidgetInstanceEntry * ex = e->pChildList->first();ex;ex = e->pChildList->next())
 		{
 			options_kvs_module_print_pages(c,ex,szPre.ptr());
 		}
@@ -166,9 +166,9 @@ static void options_kvs_module_print_pages(KviKvsModuleCommandCall * c,KviOption
 
 static bool options_kvs_cmd_pages(KviKvsModuleCommandCall * c)
 {
-	KviPointerList<KviOptionsWidgetInstanceEntry> * l = g_pOptionsInstanceManager->instanceEntryTree();
+	KviPointerList<OptionsWidgetInstanceEntry> * l = g_pOptionsInstanceManager->instanceEntryTree();
 
-	for(KviOptionsWidgetInstanceEntry * e = l->first();e;e = l->next())
+	for(OptionsWidgetInstanceEntry * e = l->first();e;e = l->next())
 	{
 		options_kvs_module_print_pages(c,e,"");
 	}
@@ -200,7 +200,7 @@ static bool options_kvs_cmd_edit(KviKvsModuleCommandCall * c)
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("option",KVS_PT_STRING,0,szOption)
 	KVSM_PARAMETERS_END(c)
-	KviOptionsWidgetInstanceEntry * e = g_pOptionsInstanceManager->findInstanceEntry(szOption.toUtf8().data());
+	OptionsWidgetInstanceEntry * e = g_pOptionsInstanceManager->findInstanceEntry(szOption.toUtf8().data());
 	if(!e)
 	{
 		c->warning(__tr2qs_ctx("No such options page class name %Q","options"),&szOption);
@@ -215,7 +215,7 @@ static bool options_kvs_cmd_edit(KviKvsModuleCommandCall * c)
 		return true;
 	}
 
-	KviOptionsWidgetContainer * wc = new KviOptionsWidgetContainer(0,c->hasSwitch('m',"modal"));
+	OptionsWidgetContainer * wc = new OptionsWidgetContainer(0,c->hasSwitch('m',"modal"));
 
 	wc->setup(g_pOptionsInstanceManager->getInstance(e,wc));
 
@@ -266,7 +266,7 @@ static bool options_kvs_fnc_isdialog(KviKvsModuleFunctionCall * c)
 
 static bool options_module_init(KviModule * m)
 {
-	g_pOptionsInstanceManager = new KviOptionsInstanceManager();
+	g_pOptionsInstanceManager = new OptionsInstanceManager();
 
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"dialog",options_kvs_cmd_dialog);
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"save",options_kvs_cmd_save);
@@ -274,7 +274,7 @@ static bool options_module_init(KviModule * m)
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"edit",options_kvs_cmd_edit);
 	KVSM_REGISTER_FUNCTION(m,"isDialog",options_kvs_fnc_isdialog);
 
-	g_pOptionsDialogDict = new KviPointerHashTable<QString,KviOptionsDialog>;
+	g_pOptionsDialogDict = new KviPointerHashTable<QString,OptionsDialog>;
 	g_pOptionsDialogDict->setAutoDelete(false);
 
 	return true;
@@ -282,10 +282,10 @@ static bool options_module_init(KviModule * m)
 
 static bool options_module_cleanup(KviModule *m)
 {
-	KviPointerHashTableIterator<QString,KviOptionsDialog> it(*g_pOptionsDialogDict);
-	KviPointerList<KviOptionsDialog> l;
+	KviPointerHashTableIterator<QString,OptionsDialog> it(*g_pOptionsDialogDict);
+	KviPointerList<OptionsDialog> l;
 	l.setAutoDelete(false);
-	KviOptionsDialog * d;
+	OptionsDialog * d;
 	while( (d = it.current()) )
 	{
 		l.append(d);
diff --git a/src/modules/options/mkcreateinstanceproc.sh b/src/modules/options/mkcreateinstanceproc.sh
index 189e20b72..b4de22c53 100755
--- a/src/modules/options/mkcreateinstanceproc.sh
+++ b/src/modules/options/mkcreateinstanceproc.sh
@@ -2,7 +2,7 @@
 
 #################################################################################
 #
-# Generator for instances.h and instances.cpp
+# Generator for OptionsInstanceManager.h and OptionsInstanceManager.cpp
 #
 # This file is part of the KVirc irc client distribution
 # Copyright (C) 2001-2008 Szymon Stefanek (pragma at kvirc dot net)
@@ -10,17 +10,17 @@
 #################################################################################
 
 
-echo "" > instances.h
+echo "" > OptionsInstanceManager.h
 
 #################################################################################
-cat >> instances.h <<EOF
+cat >> OptionsInstanceManager.h <<EOF
 
 #ifndef __OPTIONS_INSTANCES_H__
 #define __OPTIONS_INSTANCES_H__
 
 //=============================================================================
 //
-//   File : instances.h
+//   File : OptionsInstanceManager.h
 //
 //   This file is part of the KVirc irc client distribution
 //   Copyright (C) 2001-2008 Szymon Stefanek (pragma at kvirc dot net)
@@ -53,10 +53,10 @@ cat >> instances.h <<EOF
 #include "KviPointerList.h"
 #include "KviQString.h"
 
-typedef struct _KviOptionsWidgetInstanceEntry KviOptionsWidgetInstanceEntry;
+typedef struct _OptionsWidgetInstanceEntry OptionsWidgetInstanceEntry;
 
 
-typedef struct _KviOptionsWidgetInstanceEntry
+typedef struct _OptionsWidgetInstanceEntry
 {
 	KviOptionsWidget                          * (*createProc)(QWidget *);
 	KviOptionsWidget                          * pWidget;   // singleton
@@ -70,28 +70,28 @@ typedef struct _KviOptionsWidgetInstanceEntry
 	QString                                     szGroup;
 	bool                                        bIsContainer;
 	bool                                        bIsNotContained;
-	KviPointerList<KviOptionsWidgetInstanceEntry> * pChildList;
-	bool                                        bDoInsert; // a helper for KviOptionsDialog::fillListView()
-} KviOptionsWidgetInstanceEntry;
+	KviPointerList<OptionsWidgetInstanceEntry> * pChildList;
+	bool                                        bDoInsert; // a helper for OptionsDialog::fillListView()
+} OptionsWidgetInstanceEntry;
 
 
-class KviOptionsInstanceManager : public QObject
+class OptionsInstanceManager : public QObject
 {
 	Q_OBJECT
 public:
-	KviOptionsInstanceManager();
-	virtual ~KviOptionsInstanceManager();
+	OptionsInstanceManager();
+	virtual ~OptionsInstanceManager();
 protected:
-	KviPointerList<KviOptionsWidgetInstanceEntry> *  m_pInstanceTree;
+	KviPointerList<OptionsWidgetInstanceEntry> *  m_pInstanceTree;
 public:
-	KviPointerList<KviOptionsWidgetInstanceEntry> * instanceEntryTree(){ return m_pInstanceTree; };
-	KviOptionsWidget * getInstance(KviOptionsWidgetInstanceEntry * e,QWidget * par);
-	KviOptionsWidgetInstanceEntry * findInstanceEntry(const char * clName);
+	KviPointerList<OptionsWidgetInstanceEntry> * instanceEntryTree(){ return m_pInstanceTree; };
+	KviOptionsWidget * getInstance(OptionsWidgetInstanceEntry * e,QWidget * par);
+	OptionsWidgetInstanceEntry * findInstanceEntry(const char * clName);
 	void cleanup(KviModule * m);
 protected:
-	KviOptionsWidgetInstanceEntry * findInstanceEntry(const char * clName,KviPointerList<KviOptionsWidgetInstanceEntry> * l);
-	KviOptionsWidgetInstanceEntry * findInstanceEntry(const QObject * ptr,KviPointerList<KviOptionsWidgetInstanceEntry> * l);
-	void deleteInstanceTree(KviPointerList<KviOptionsWidgetInstanceEntry> * l);
+	OptionsWidgetInstanceEntry * findInstanceEntry(const char * clName,KviPointerList<OptionsWidgetInstanceEntry> * l);
+	OptionsWidgetInstanceEntry * findInstanceEntry(const QObject * ptr,KviPointerList<OptionsWidgetInstanceEntry> * l);
+	void deleteInstanceTree(KviPointerList<OptionsWidgetInstanceEntry> * l);
 protected slots:
 	void widgetDestroyed();
 };
@@ -101,19 +101,19 @@ protected slots:
 EOF
 ######################################################################################################
 
-CLASS_LIST=`grep -h "[ ]*\:[ ]*public[ ]*KviOptionsWidget" optw_*.h | sed -e 's/[ ]*\:[ ]*public[ ]*KviOptionsWidget'//g | sed -e 's/[ 	]*class[ ]*//g'`
+CLASS_LIST=`grep -h "[ ]*\:[ ]*public[ ]*KviOptionsWidget" OptionsWidget_*.h | sed -e 's/[ ]*\:[ ]*public[ ]*KviOptionsWidget'//g | sed -e 's/[ 	]*class[ ]*//g'`
 
 
-TARGET="instances.cpp"
+TARGET="OptionsInstanceManager.cpp"
 
 echo "" > $TARGET
 
 #################################################################################
-cat >> instances.cpp <<EOF
+cat >> OptionsInstanceManager.cpp <<EOF
 
 //=============================================================================
 //
-//   File : instances.cpp
+//   File : OptionsInstanceManager.cpp
 //
 //   This file is part of the KVirc irc client distribution
 //   Copyright (C) 2001-2008 Szymon Stefanek (stefanek@tin.it)
@@ -145,16 +145,16 @@ EOF
 #################################################################################
 
 
-for afile in optw_*.h; do
+for afile in OptionsWidget_*.h; do
 	echo "#include \"$afile\"" >> $TARGET
 done
 
 #################################################################################
-cat >> instances.cpp <<EOF
+cat >> OptionsInstanceManager.cpp <<EOF
 
 #include "KviLocale.h"
 #include "KviIconManager.h"
-#include "instances.h"
+#include "OptionsInstanceManager.h"
 
 int g_iOptionWidgetInstances = 0;
 
@@ -172,7 +172,7 @@ for aclass in $CLASS_LIST; do
 done
 
 #################################################################################
-cat >> instances.cpp <<EOF
+cat >> OptionsInstanceManager.cpp <<EOF
 
 
 EOF
@@ -184,15 +184,15 @@ for aclass in $CLASS_LIST; do
 done
 
 #################################################################################
-cat >> instances.cpp <<EOF
+cat >> OptionsInstanceManager.cpp <<EOF
 
-KviOptionsInstanceManager::KviOptionsInstanceManager()
+OptionsInstanceManager::OptionsInstanceManager()
 : QObject(0)
 {
 
 	//qDebug("Instantiating");
 	// Create the global widget dict : case sensitive, do not copy keys
-	m_pInstanceTree = new KviPointerList<KviOptionsWidgetInstanceEntry>;
+	m_pInstanceTree = new KviPointerList<OptionsWidgetInstanceEntry>;
 	m_pInstanceTree->setAutoDelete(true);
 
 EOF
@@ -205,7 +205,7 @@ mkdir -p $CLASSDIR
 rm -f $CLASSDIR/*
 
 for aclass in $CLASS_LIST; do
-	PARENT=`grep -h "KVI_OPTIONS_WIDGET_PARENT_$aclass" optw_*.h | sed -e 's/#define//g' | sed -e s/KVI_OPTIONS_WIDGET_PARENT_$aclass//g | sed -e 's/[ ]*//g'`
+	PARENT=`grep -h "KVI_OPTIONS_WIDGET_PARENT_$aclass" OptionsWidget_*.h | sed -e 's/#define//g' | sed -e s/KVI_OPTIONS_WIDGET_PARENT_$aclass//g | sed -e 's/[ ]*//g'`
 	if [ -z "$PARENT" ]; then
 		PARENT="NOPARENT"
 	fi
@@ -225,10 +225,10 @@ printclass()
 		fi
 	done
 	if [ -z "$found" ]; then
-		echo "$3	KviOptionsWidgetInstanceEntry * e$1;" >> $TARGET
+		echo "$3	OptionsWidgetInstanceEntry * e$1;" >> $TARGET
 		DECLARED="$DECLARED $1"
 	fi
-	echo "$3	e$1 = new KviOptionsWidgetInstanceEntry;"  >> $TARGET
+	echo "$3	e$1 = new OptionsWidgetInstanceEntry;"  >> $TARGET
 	echo -n "$3	e$1->createProc = &class$2"  >> $TARGET
 		echo "_createInstanceProc;"  >> $TARGET
 	echo "$3	e$1->pWidget = 0;" >> $TARGET
@@ -283,7 +283,7 @@ addchildren()
 			printclass $1 $achild "$3"
 			if [ -f "$CLASSDIR/$achild" ]; then
 				echo "" >> $TARGET
-				echo "$3	e$1->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;" >> $TARGET
+				echo "$3	e$1->pChildList = new KviPointerList<OptionsWidgetInstanceEntry>;" >> $TARGET
 				echo "$3	e$1->pChildList->setAutoDelete(true);" >> $TARGET
 				NEXTLEVEL=`expr $1 + 1`
 				addchildren $NEXTLEVEL $achild "$3	"
@@ -304,15 +304,15 @@ cat >> $TARGET <<EOF
 
 }
 
-void KviOptionsInstanceManager::deleteInstanceTree(KviPointerList<KviOptionsWidgetInstanceEntry> * l)
+void OptionsInstanceManager::deleteInstanceTree(KviPointerList<OptionsWidgetInstanceEntry> * l)
 {
 	if(l)
 	{
-		for(KviOptionsWidgetInstanceEntry * e = l->first();e;e = l->next())
+		for(OptionsWidgetInstanceEntry * e = l->first();e;e = l->next())
 		{
 			if(e->pWidget)
 			{
-				if(e->pWidget->parent()->inherits("KviOptionsWidgetContainer"))
+				if(e->pWidget->parent()->inherits("OptionsWidgetContainer"))
 				{
 					disconnect(e->pWidget,SIGNAL(destroyed()),this,SLOT(widgetDestroyed()));
 					delete e->pWidget->parent();
@@ -328,21 +328,21 @@ void KviOptionsInstanceManager::deleteInstanceTree(KviPointerList<KviOptionsWidg
 }
 
 
-KviOptionsInstanceManager::~KviOptionsInstanceManager()
+OptionsInstanceManager::~OptionsInstanceManager()
 {
 	if(m_pInstanceTree)
-		qDebug("Ops...KviOptionsInstanceManager::cleanup() not called ?");
+		qDebug("Ops...OptionsInstanceManager::cleanup() not called ?");
 }
 
-void KviOptionsInstanceManager::cleanup(KviModule *)
+void OptionsInstanceManager::cleanup(KviModule *)
 {
 	deleteInstanceTree(m_pInstanceTree);
 	m_pInstanceTree = 0;
 }
 
-void KviOptionsInstanceManager::widgetDestroyed()
+void OptionsInstanceManager::widgetDestroyed()
 {
-	KviOptionsWidgetInstanceEntry * e = findInstanceEntry(sender(),m_pInstanceTree);
+	OptionsWidgetInstanceEntry * e = findInstanceEntry(sender(),m_pInstanceTree);
 	if(e)
 		e->pWidget = 0;
 	if(g_iOptionWidgetInstances > 0)
@@ -350,7 +350,7 @@ void KviOptionsInstanceManager::widgetDestroyed()
 
 }
 
-KviOptionsWidget * KviOptionsInstanceManager::getInstance(KviOptionsWidgetInstanceEntry * e,QWidget * par)
+KviOptionsWidget * OptionsInstanceManager::getInstance(OptionsWidgetInstanceEntry * e,QWidget * par)
 {
 	if(!e)
 		return NULL;
@@ -379,7 +379,7 @@ KviOptionsWidget * KviOptionsInstanceManager::getInstance(KviOptionsWidgetInstan
 	{
 		QWidget * oldPar = (QWidget *)e->pWidget->parent();
 		e->pWidget->setParent(par); //reparent(par,QPoint(0,0));
-		if(oldPar->inherits("KviOptionsWidgetContainer"))
+		if(oldPar->inherits("OptionsWidgetContainer"))
 			delete oldPar;
 		// else it's very likely a QStackedWidget, child of a KviOptionsWidget: don't delete
 	}
@@ -390,15 +390,15 @@ KviOptionsWidget * KviOptionsInstanceManager::getInstance(KviOptionsWidgetInstan
 		e->pWidget->createTabbedPage();
 		if(e->pChildList)
 		{
-			KviPointerList<KviOptionsWidgetInstanceEntry> tmp;
+			KviPointerList<OptionsWidgetInstanceEntry> tmp;
 			tmp.setAutoDelete(false);
 
-			for(KviOptionsWidgetInstanceEntry * e2 = e->pChildList->first();e2;e2 = e->pChildList->next())
+			for(OptionsWidgetInstanceEntry * e2 = e->pChildList->first();e2;e2 = e->pChildList->next())
 			{
 				// add only non containers and widgets not explicitly marked as noncontained
 				if((!e2->bIsContainer) && (!e2->bIsNotContained))
 				{
-					KviOptionsWidgetInstanceEntry * ee = tmp.first();
+					OptionsWidgetInstanceEntry * ee = tmp.first();
 					int idx = 0;
 					while(ee)
 					{
@@ -410,7 +410,7 @@ KviOptionsWidget * KviOptionsInstanceManager::getInstance(KviOptionsWidgetInstan
 				}
 			}
 
-			for(KviOptionsWidgetInstanceEntry * e3 = tmp.last();e3;e3 = tmp.prev())
+			for(OptionsWidgetInstanceEntry * e3 = tmp.last();e3;e3 = tmp.prev())
 			{
 				KviOptionsWidget * ow = getInstance(e3,e->pWidget->tabWidget());
 				e->pWidget->addOptionsWidget(e3->szName,*(g_pIconManager->getSmallIcon(e3->iIcon)),ow);
@@ -420,16 +420,16 @@ KviOptionsWidget * KviOptionsInstanceManager::getInstance(KviOptionsWidgetInstan
 	return e->pWidget;
 }
 
-KviOptionsWidgetInstanceEntry * KviOptionsInstanceManager::findInstanceEntry(const QObject * ptr,KviPointerList<KviOptionsWidgetInstanceEntry> * l)
+OptionsWidgetInstanceEntry * OptionsInstanceManager::findInstanceEntry(const QObject * ptr,KviPointerList<OptionsWidgetInstanceEntry> * l)
 {
 	if(l)
 	{
-		for(KviOptionsWidgetInstanceEntry * e = l->first();e;e = l->next())
+		for(OptionsWidgetInstanceEntry * e = l->first();e;e = l->next())
 		{
 			if(ptr == e->pWidget)return e;
 			if(e->pChildList)
 			{
-				KviOptionsWidgetInstanceEntry * e2 = findInstanceEntry(ptr,e->pChildList);
+				OptionsWidgetInstanceEntry * e2 = findInstanceEntry(ptr,e->pChildList);
 				if(e2)return e2;
 			}
 		}
@@ -437,16 +437,16 @@ KviOptionsWidgetInstanceEntry * KviOptionsInstanceManager::findInstanceEntry(con
 	return 0;
 }
 
-KviOptionsWidgetInstanceEntry * KviOptionsInstanceManager::findInstanceEntry(const char * clName,KviPointerList<KviOptionsWidgetInstanceEntry> * l)
+OptionsWidgetInstanceEntry * OptionsInstanceManager::findInstanceEntry(const char * clName,KviPointerList<OptionsWidgetInstanceEntry> * l)
 {
 	if(l)
 	{
-		for(KviOptionsWidgetInstanceEntry * e = l->first();e;e = l->next())
+		for(OptionsWidgetInstanceEntry * e = l->first();e;e = l->next())
 		{
 			if(kvi_strEqualCI(e->szClassName,clName))return e;
 			if(e->pChildList)
 			{
-				KviOptionsWidgetInstanceEntry * e2 = findInstanceEntry(clName,e->pChildList);
+				OptionsWidgetInstanceEntry * e2 = findInstanceEntry(clName,e->pChildList);
 				if(e2)return e2;
 			}
 		}
@@ -454,13 +454,13 @@ KviOptionsWidgetInstanceEntry * KviOptionsInstanceManager::findInstanceEntry(con
 	return 0;
 }
 
-KviOptionsWidgetInstanceEntry * KviOptionsInstanceManager::findInstanceEntry(const char * clName)
+OptionsWidgetInstanceEntry * OptionsInstanceManager::findInstanceEntry(const char * clName)
 {
 	return findInstanceEntry(clName,m_pInstanceTree);
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-	#include "m_instances.moc"
+	#include "m_OptionsInstanceManager.moc"
 #endif
 
 EOF