218 files changed, 40 insertions, 60 deletions

diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln
index b62be07484..03543ec6b9 100644
--- a/bin10/mir_full.sln
+++ b/bin10/mir_full.sln
@@ -10,10 +10,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dbx_3x", "..\plugins\Db3x\d
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Import", "..\plugins\Import\import_10.vcxproj", "{9299B507-1AF9-4C93-9560-5F637D1E0C9E}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Clist_modern", "..\plugins\Modernb\clist_modern_10.vcxproj", "{D9057E63-AAAA-4FE7-800A-20C02F4761F3}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Clist_mw", "..\plugins\Mwclist\clist_mw_10.vcxproj", "{56997126-0098-407A-94E1-7C5748C1C9EF}"

-EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dbx_mmap", "..\plugins\Db3x_mmap\db3x_mmap_10.vcxproj", "{20D781FB-4A20-4B75-B863-304A47182966}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AdvaImg", "..\plugins\FreeImage\FreeImage_10.vcxproj", "{D0C4EACD-F264-4CFA-9AFC-3918FEC31A9A}"

@@ -50,8 +46,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xStatus_ICQ", "..\protocols
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xStatus_Jabber", "..\protocols\JabberG\jabber_xstatus\JABBER_XSTATUS_10.vcxproj", "{6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Toolbar_icons", "..\plugins\Modernb\icons_pack\ICONS_10.vcxproj", "{796B43EF-DACE-4145-8571-31886F45A2C0}"

-EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cln_skinedit", "..\plugins\Clist_nicer\skineditor\skinedit_10.vcxproj", "{987F026D-EB1F-4013-ADA8-2406ACCDA526}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dbtool", "..\tools\dbtool\dbtool_10.vcxproj", "{A2E9DA24-95E4-4414-94AF-488A382E276A}"

@@ -324,6 +318,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_MSN", "..\protocols\M
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Yahoo", "..\protocols\Yahoo\proto_yahoo\Proto_Yahoo.vcxproj", "{BFEBA9D5-CAB7-42C0-BE0B-0888A7A458AB}"

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Clist_modern", "..\plugins\Clist_modern\clist_modern_10.vcxproj", "{D9057E63-AAAA-4FE7-800A-20C02F4761F3}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Clist_mw", "..\plugins\Clist_mw\clist_mw_10.vcxproj", "{56997126-0098-407A-94E1-7C5748C1C9EF}"

+EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|Win32 = Debug|Win32

@@ -372,22 +370,6 @@ Global
 		{9299B507-1AF9-4C93-9560-5F637D1E0C9E}.Release|Win32.Build.0 = Release|Win32

 		{9299B507-1AF9-4C93-9560-5F637D1E0C9E}.Release|x64.ActiveCfg = Release|x64

 		{9299B507-1AF9-4C93-9560-5F637D1E0C9E}.Release|x64.Build.0 = Release|x64

-		{D9057E63-AAAA-4FE7-800A-20C02F4761F3}.Debug|Win32.ActiveCfg = Debug|Win32

-		{D9057E63-AAAA-4FE7-800A-20C02F4761F3}.Debug|Win32.Build.0 = Debug|Win32

-		{D9057E63-AAAA-4FE7-800A-20C02F4761F3}.Debug|x64.ActiveCfg = Debug|x64

-		{D9057E63-AAAA-4FE7-800A-20C02F4761F3}.Debug|x64.Build.0 = Debug|x64

-		{D9057E63-AAAA-4FE7-800A-20C02F4761F3}.Release|Win32.ActiveCfg = Release|Win32

-		{D9057E63-AAAA-4FE7-800A-20C02F4761F3}.Release|Win32.Build.0 = Release|Win32

-		{D9057E63-AAAA-4FE7-800A-20C02F4761F3}.Release|x64.ActiveCfg = Release|x64

-		{D9057E63-AAAA-4FE7-800A-20C02F4761F3}.Release|x64.Build.0 = Release|x64

-		{56997126-0098-407A-94E1-7C5748C1C9EF}.Debug|Win32.ActiveCfg = Debug|Win32

-		{56997126-0098-407A-94E1-7C5748C1C9EF}.Debug|Win32.Build.0 = Debug|Win32

-		{56997126-0098-407A-94E1-7C5748C1C9EF}.Debug|x64.ActiveCfg = Debug|x64

-		{56997126-0098-407A-94E1-7C5748C1C9EF}.Debug|x64.Build.0 = Debug|x64

-		{56997126-0098-407A-94E1-7C5748C1C9EF}.Release|Win32.ActiveCfg = Release|Win32

-		{56997126-0098-407A-94E1-7C5748C1C9EF}.Release|Win32.Build.0 = Release|Win32

-		{56997126-0098-407A-94E1-7C5748C1C9EF}.Release|x64.ActiveCfg = Release|x64

-		{56997126-0098-407A-94E1-7C5748C1C9EF}.Release|x64.Build.0 = Release|x64

 		{20D781FB-4A20-4B75-B863-304A47182966}.Debug|Win32.ActiveCfg = Debug|Win32

 		{20D781FB-4A20-4B75-B863-304A47182966}.Debug|Win32.Build.0 = Debug|Win32

 		{20D781FB-4A20-4B75-B863-304A47182966}.Debug|x64.ActiveCfg = Debug|x64

@@ -532,14 +514,6 @@ Global
 		{6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E}.Release|Win32.Build.0 = Release|Win32

 		{6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E}.Release|x64.ActiveCfg = Release|x64

 		{6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E}.Release|x64.Build.0 = Release|x64

-		{796B43EF-DACE-4145-8571-31886F45A2C0}.Debug|Win32.ActiveCfg = Debug|Win32

-		{796B43EF-DACE-4145-8571-31886F45A2C0}.Debug|Win32.Build.0 = Debug|Win32

-		{796B43EF-DACE-4145-8571-31886F45A2C0}.Debug|x64.ActiveCfg = Debug|x64

-		{796B43EF-DACE-4145-8571-31886F45A2C0}.Debug|x64.Build.0 = Debug|x64

-		{796B43EF-DACE-4145-8571-31886F45A2C0}.Release|Win32.ActiveCfg = Release|Win32

-		{796B43EF-DACE-4145-8571-31886F45A2C0}.Release|Win32.Build.0 = Release|Win32

-		{796B43EF-DACE-4145-8571-31886F45A2C0}.Release|x64.ActiveCfg = Release|x64

-		{796B43EF-DACE-4145-8571-31886F45A2C0}.Release|x64.Build.0 = Release|x64

 		{987F026D-EB1F-4013-ADA8-2406ACCDA526}.Debug|Win32.ActiveCfg = Debug|Win32

 		{987F026D-EB1F-4013-ADA8-2406ACCDA526}.Debug|Win32.Build.0 = Debug|Win32

 		{987F026D-EB1F-4013-ADA8-2406ACCDA526}.Debug|x64.ActiveCfg = Debug|x64

@@ -1624,6 +1598,22 @@ Global
 		{BFEBA9D5-CAB7-42C0-BE0B-0888A7A458AB}.Release|Win32.Build.0 = Release|Win32

 		{BFEBA9D5-CAB7-42C0-BE0B-0888A7A458AB}.Release|x64.ActiveCfg = Release|x64

 		{BFEBA9D5-CAB7-42C0-BE0B-0888A7A458AB}.Release|x64.Build.0 = Release|x64

+		{D9057E63-AAAA-4FE7-800A-20C02F4761F3}.Debug|Win32.ActiveCfg = Debug|Win32

+		{D9057E63-AAAA-4FE7-800A-20C02F4761F3}.Debug|Win32.Build.0 = Debug|Win32

+		{D9057E63-AAAA-4FE7-800A-20C02F4761F3}.Debug|x64.ActiveCfg = Debug|x64

+		{D9057E63-AAAA-4FE7-800A-20C02F4761F3}.Debug|x64.Build.0 = Debug|x64

+		{D9057E63-AAAA-4FE7-800A-20C02F4761F3}.Release|Win32.ActiveCfg = Release|Win32

+		{D9057E63-AAAA-4FE7-800A-20C02F4761F3}.Release|Win32.Build.0 = Release|Win32

+		{D9057E63-AAAA-4FE7-800A-20C02F4761F3}.Release|x64.ActiveCfg = Release|x64

+		{D9057E63-AAAA-4FE7-800A-20C02F4761F3}.Release|x64.Build.0 = Release|x64

+		{56997126-0098-407A-94E1-7C5748C1C9EF}.Debug|Win32.ActiveCfg = Debug|Win32

+		{56997126-0098-407A-94E1-7C5748C1C9EF}.Debug|Win32.Build.0 = Debug|Win32

+		{56997126-0098-407A-94E1-7C5748C1C9EF}.Debug|x64.ActiveCfg = Debug|x64

+		{56997126-0098-407A-94E1-7C5748C1C9EF}.Debug|x64.Build.0 = Debug|x64

+		{56997126-0098-407A-94E1-7C5748C1C9EF}.Release|Win32.ActiveCfg = Release|Win32

+		{56997126-0098-407A-94E1-7C5748C1C9EF}.Release|Win32.Build.0 = Release|Win32

+		{56997126-0098-407A-94E1-7C5748C1C9EF}.Release|x64.ActiveCfg = Release|x64

+		{56997126-0098-407A-94E1-7C5748C1C9EF}.Release|x64.Build.0 = Release|x64

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

diff --git a/bin10/miranda32.sln b/bin10/miranda32.sln
index 6b4341dcf1..d8a44b3434 100644
--- a/bin10/miranda32.sln
+++ b/bin10/miranda32.sln
@@ -10,10 +10,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dbx_3x", "..\plugins\Db3x\d
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Import", "..\plugins\Import\import_10.vcxproj", "{9299B507-1AF9-4C93-9560-5F637D1E0C9E}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Clist_modern", "..\plugins\Modernb\clist_modern_10.vcxproj", "{D9057E63-AAAA-4FE7-800A-20C02F4761F3}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Clist_mw", "..\plugins\Mwclist\clist_mw_10.vcxproj", "{56997126-0098-407A-94E1-7C5748C1C9EF}"

-EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dbx_mmap", "..\plugins\db3x_mmap\db3x_mmap_10.vcxproj", "{20D781FB-4A20-4B75-B863-304A47182966}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AdvaImg", "..\plugins\freeimage\FreeImage_10.vcxproj", "{D0C4EACD-F264-4CFA-9AFC-3918FEC31A9A}"

@@ -50,8 +46,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xStatus_ICQ", "..\protocols
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xStatus_Jabber", "..\protocols\JabberG\jabber_xstatus\JABBER_XSTATUS_10.vcxproj", "{6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Toolbar_icons", "..\plugins\Modernb\icons_pack\ICONS_10.vcxproj", "{796B43EF-DACE-4145-8571-31886F45A2C0}"

-EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cln_skinedit", "..\plugins\clist_nicer\skineditor\skinedit_10.vcxproj", "{987F026D-EB1F-4013-ADA8-2406ACCDA526}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dbtool", "..\tools\dbtool\dbtool_10.vcxproj", "{A2E9DA24-95E4-4414-94AF-488A382E276A}"

@@ -74,6 +68,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_MSN", "..\protocols\M
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Yahoo", "..\protocols\Yahoo\proto_yahoo\Proto_Yahoo.vcxproj", "{BFEBA9D5-CAB7-42C0-BE0B-0888A7A458AB}"

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Clist_mw", "..\plugins\Clist_mw\clist_mw_10.vcxproj", "{56997126-0098-407A-94E1-7C5748C1C9EF}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Clist_modern", "..\plugins\Clist_modern\clist_modern_10.vcxproj", "{D9057E63-AAAA-4FE7-800A-20C02F4761F3}"

+EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|Win32 = Debug|Win32

@@ -122,22 +120,6 @@ Global
 		{9299B507-1AF9-4C93-9560-5F637D1E0C9E}.Release|Win32.Build.0 = Release|Win32

 		{9299B507-1AF9-4C93-9560-5F637D1E0C9E}.Release|x64.ActiveCfg = Release|x64

 		{9299B507-1AF9-4C93-9560-5F637D1E0C9E}.Release|x64.Build.0 = Release|x64

-		{D9057E63-AAAA-4FE7-800A-20C02F4761F3}.Debug|Win32.ActiveCfg = Debug|Win32

-		{D9057E63-AAAA-4FE7-800A-20C02F4761F3}.Debug|Win32.Build.0 = Debug|Win32

-		{D9057E63-AAAA-4FE7-800A-20C02F4761F3}.Debug|x64.ActiveCfg = Debug|x64

-		{D9057E63-AAAA-4FE7-800A-20C02F4761F3}.Debug|x64.Build.0 = Debug|x64

-		{D9057E63-AAAA-4FE7-800A-20C02F4761F3}.Release|Win32.ActiveCfg = Release|Win32

-		{D9057E63-AAAA-4FE7-800A-20C02F4761F3}.Release|Win32.Build.0 = Release|Win32

-		{D9057E63-AAAA-4FE7-800A-20C02F4761F3}.Release|x64.ActiveCfg = Release|x64

-		{D9057E63-AAAA-4FE7-800A-20C02F4761F3}.Release|x64.Build.0 = Release|x64

-		{56997126-0098-407A-94E1-7C5748C1C9EF}.Debug|Win32.ActiveCfg = Debug|Win32

-		{56997126-0098-407A-94E1-7C5748C1C9EF}.Debug|Win32.Build.0 = Debug|Win32

-		{56997126-0098-407A-94E1-7C5748C1C9EF}.Debug|x64.ActiveCfg = Debug|x64

-		{56997126-0098-407A-94E1-7C5748C1C9EF}.Debug|x64.Build.0 = Debug|x64

-		{56997126-0098-407A-94E1-7C5748C1C9EF}.Release|Win32.ActiveCfg = Release|Win32

-		{56997126-0098-407A-94E1-7C5748C1C9EF}.Release|Win32.Build.0 = Release|Win32

-		{56997126-0098-407A-94E1-7C5748C1C9EF}.Release|x64.ActiveCfg = Release|x64

-		{56997126-0098-407A-94E1-7C5748C1C9EF}.Release|x64.Build.0 = Release|x64

 		{20D781FB-4A20-4B75-B863-304A47182966}.Debug|Win32.ActiveCfg = Debug|Win32

 		{20D781FB-4A20-4B75-B863-304A47182966}.Debug|Win32.Build.0 = Debug|Win32

 		{20D781FB-4A20-4B75-B863-304A47182966}.Debug|x64.ActiveCfg = Debug|x64

@@ -282,14 +264,6 @@ Global
 		{6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E}.Release|Win32.Build.0 = Release|Win32

 		{6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E}.Release|x64.ActiveCfg = Release|x64

 		{6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E}.Release|x64.Build.0 = Release|x64

-		{796B43EF-DACE-4145-8571-31886F45A2C0}.Debug|Win32.ActiveCfg = Debug|Win32

-		{796B43EF-DACE-4145-8571-31886F45A2C0}.Debug|Win32.Build.0 = Debug|Win32

-		{796B43EF-DACE-4145-8571-31886F45A2C0}.Debug|x64.ActiveCfg = Debug|x64

-		{796B43EF-DACE-4145-8571-31886F45A2C0}.Debug|x64.Build.0 = Debug|x64

-		{796B43EF-DACE-4145-8571-31886F45A2C0}.Release|Win32.ActiveCfg = Release|Win32

-		{796B43EF-DACE-4145-8571-31886F45A2C0}.Release|Win32.Build.0 = Release|Win32

-		{796B43EF-DACE-4145-8571-31886F45A2C0}.Release|x64.ActiveCfg = Release|x64

-		{796B43EF-DACE-4145-8571-31886F45A2C0}.Release|x64.Build.0 = Release|x64

 		{987F026D-EB1F-4013-ADA8-2406ACCDA526}.Debug|Win32.ActiveCfg = Debug|Win32

 		{987F026D-EB1F-4013-ADA8-2406ACCDA526}.Debug|Win32.Build.0 = Debug|Win32

 		{987F026D-EB1F-4013-ADA8-2406ACCDA526}.Debug|x64.ActiveCfg = Debug|x64

@@ -378,6 +352,22 @@ Global
 		{BFEBA9D5-CAB7-42C0-BE0B-0888A7A458AB}.Release|Win32.Build.0 = Release|Win32

 		{BFEBA9D5-CAB7-42C0-BE0B-0888A7A458AB}.Release|x64.ActiveCfg = Release|x64

 		{BFEBA9D5-CAB7-42C0-BE0B-0888A7A458AB}.Release|x64.Build.0 = Release|x64

+		{56997126-0098-407A-94E1-7C5748C1C9EF}.Debug|Win32.ActiveCfg = Debug|Win32

+		{56997126-0098-407A-94E1-7C5748C1C9EF}.Debug|Win32.Build.0 = Debug|Win32

+		{56997126-0098-407A-94E1-7C5748C1C9EF}.Debug|x64.ActiveCfg = Debug|x64

+		{56997126-0098-407A-94E1-7C5748C1C9EF}.Debug|x64.Build.0 = Debug|x64

+		{56997126-0098-407A-94E1-7C5748C1C9EF}.Release|Win32.ActiveCfg = Release|Win32

+		{56997126-0098-407A-94E1-7C5748C1C9EF}.Release|Win32.Build.0 = Release|Win32

+		{56997126-0098-407A-94E1-7C5748C1C9EF}.Release|x64.ActiveCfg = Release|x64

+		{56997126-0098-407A-94E1-7C5748C1C9EF}.Release|x64.Build.0 = Release|x64

+		{D9057E63-AAAA-4FE7-800A-20C02F4761F3}.Debug|Win32.ActiveCfg = Debug|Win32

+		{D9057E63-AAAA-4FE7-800A-20C02F4761F3}.Debug|Win32.Build.0 = Debug|Win32

+		{D9057E63-AAAA-4FE7-800A-20C02F4761F3}.Debug|x64.ActiveCfg = Debug|x64

+		{D9057E63-AAAA-4FE7-800A-20C02F4761F3}.Debug|x64.Build.0 = Debug|x64

+		{D9057E63-AAAA-4FE7-800A-20C02F4761F3}.Release|Win32.ActiveCfg = Release|Win32

+		{D9057E63-AAAA-4FE7-800A-20C02F4761F3}.Release|Win32.Build.0 = Release|Win32

+		{D9057E63-AAAA-4FE7-800A-20C02F4761F3}.Release|x64.ActiveCfg = Release|x64

+		{D9057E63-AAAA-4FE7-800A-20C02F4761F3}.Release|x64.Build.0 = Release|x64

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

diff --git a/plugins/Modernb/MString.cpp b/plugins/Clist_modern/MString.cpp
index caba4e022c..caba4e022c 100644
--- a/plugins/Modernb/MString.cpp
+++ b/plugins/Clist_modern/MString.cpp
diff --git a/plugins/Modernb/clist_modern_10.vcxproj b/plugins/Clist_modern/clist_modern_10.vcxproj
index 2fadd17452..2fadd17452 100644
--- a/plugins/Modernb/clist_modern_10.vcxproj
+++ b/plugins/Clist_modern/clist_modern_10.vcxproj
diff --git a/plugins/Modernb/clist_modern_10.vcxproj.filters b/plugins/Clist_modern/clist_modern_10.vcxproj.filters
index 5d1d16e8a8..5d1d16e8a8 100644
--- a/plugins/Modernb/clist_modern_10.vcxproj.filters
+++ b/plugins/Clist_modern/clist_modern_10.vcxproj.filters
diff --git a/plugins/Modernb/docs/FAQ[En].txt b/plugins/Clist_modern/docs/FAQ[En].txt
index ac5fc14a08..ac5fc14a08 100644
--- a/plugins/Modernb/docs/FAQ[En].txt
+++ b/plugins/Clist_modern/docs/FAQ[En].txt
diff --git a/plugins/Modernb/docs/ReadMe.txt b/plugins/Clist_modern/docs/ReadMe.txt
index bc1f640c54..bc1f640c54 100644
--- a/plugins/Modernb/docs/ReadMe.txt
+++ b/plugins/Clist_modern/docs/ReadMe.txt
diff --git a/plugins/Modernb/docs/skinpp.txt b/plugins/Clist_modern/docs/skinpp.txt
index 0620926043..0620926043 100644
--- a/plugins/Modernb/docs/skinpp.txt
+++ b/plugins/Clist_modern/docs/skinpp.txt
diff --git a/plugins/Modernb/docs/template.txt b/plugins/Clist_modern/docs/template.txt
index e1a9654bf1..e1a9654bf1 100644
--- a/plugins/Modernb/docs/template.txt
+++ b/plugins/Clist_modern/docs/template.txt
diff --git a/plugins/Modernb/hdr/MString.h b/plugins/Clist_modern/hdr/MString.h
index 28840fd84b..28840fd84b 100644
--- a/plugins/Modernb/hdr/MString.h
+++ b/plugins/Clist_modern/hdr/MString.h
diff --git a/plugins/Modernb/hdr/modern_awaymsg.h b/plugins/Clist_modern/hdr/modern_awaymsg.h
index ea51c6ddb2..ea51c6ddb2 100644
--- a/plugins/Modernb/hdr/modern_awaymsg.h
+++ b/plugins/Clist_modern/hdr/modern_awaymsg.h
diff --git a/plugins/Modernb/hdr/modern_cache_funcs.h b/plugins/Clist_modern/hdr/modern_cache_funcs.h
index 1298536ca1..1298536ca1 100644
--- a/plugins/Modernb/hdr/modern_cache_funcs.h
+++ b/plugins/Clist_modern/hdr/modern_cache_funcs.h
diff --git a/plugins/Modernb/hdr/modern_callproc.h b/plugins/Clist_modern/hdr/modern_callproc.h
index e3c1df900d..e3c1df900d 100644
--- a/plugins/Modernb/hdr/modern_callproc.h
+++ b/plugins/Clist_modern/hdr/modern_callproc.h
diff --git a/plugins/Modernb/hdr/modern_clc.h b/plugins/Clist_modern/hdr/modern_clc.h
index 56c7a8b4c0..56c7a8b4c0 100644
--- a/plugins/Modernb/hdr/modern_clc.h
+++ b/plugins/Clist_modern/hdr/modern_clc.h
diff --git a/plugins/Modernb/hdr/modern_clcpaint.h b/plugins/Clist_modern/hdr/modern_clcpaint.h
index 9c2a2d68d6..9c2a2d68d6 100644
--- a/plugins/Modernb/hdr/modern_clcpaint.h
+++ b/plugins/Clist_modern/hdr/modern_clcpaint.h
diff --git a/plugins/Modernb/hdr/modern_clist.h b/plugins/Clist_modern/hdr/modern_clist.h
index 1c1d34ee02..1c1d34ee02 100644
--- a/plugins/Modernb/hdr/modern_clist.h
+++ b/plugins/Clist_modern/hdr/modern_clist.h
diff --git a/plugins/Modernb/hdr/modern_clui.h b/plugins/Clist_modern/hdr/modern_clui.h
index 8f9c82797e..8f9c82797e 100644
--- a/plugins/Modernb/hdr/modern_clui.h
+++ b/plugins/Clist_modern/hdr/modern_clui.h
diff --git a/plugins/Modernb/hdr/modern_cluiframes.h b/plugins/Clist_modern/hdr/modern_cluiframes.h
index e2c1aade78..e2c1aade78 100644
--- a/plugins/Modernb/hdr/modern_cluiframes.h
+++ b/plugins/Clist_modern/hdr/modern_cluiframes.h
diff --git a/plugins/Modernb/hdr/modern_commonheaders.h b/plugins/Clist_modern/hdr/modern_commonheaders.h
index 9dda706e1a..9dda706e1a 100644
--- a/plugins/Modernb/hdr/modern_commonheaders.h
+++ b/plugins/Clist_modern/hdr/modern_commonheaders.h
diff --git a/plugins/Modernb/hdr/modern_commonprototypes.h b/plugins/Clist_modern/hdr/modern_commonprototypes.h
index ad79a497ed..ad79a497ed 100644
--- a/plugins/Modernb/hdr/modern_commonprototypes.h
+++ b/plugins/Clist_modern/hdr/modern_commonprototypes.h
diff --git a/plugins/Modernb/hdr/modern_defsettings.h b/plugins/Clist_modern/hdr/modern_defsettings.h
index 7298a8b4e8..7298a8b4e8 100644
--- a/plugins/Modernb/hdr/modern_defsettings.h
+++ b/plugins/Clist_modern/hdr/modern_defsettings.h
diff --git a/plugins/Modernb/hdr/modern_effectenum.h b/plugins/Clist_modern/hdr/modern_effectenum.h
index e3c5600dc6..e3c5600dc6 100644
--- a/plugins/Modernb/hdr/modern_effectenum.h
+++ b/plugins/Clist_modern/hdr/modern_effectenum.h
diff --git a/plugins/Modernb/hdr/modern_gettextasync.h b/plugins/Clist_modern/hdr/modern_gettextasync.h
index 881e2b738d..881e2b738d 100644
--- a/plugins/Modernb/hdr/modern_gettextasync.h
+++ b/plugins/Clist_modern/hdr/modern_gettextasync.h
diff --git a/plugins/Modernb/hdr/modern_global_structure.h b/plugins/Clist_modern/hdr/modern_global_structure.h
index 3ee93c7385..3ee93c7385 100644
--- a/plugins/Modernb/hdr/modern_global_structure.h
+++ b/plugins/Clist_modern/hdr/modern_global_structure.h
diff --git a/plugins/Modernb/hdr/modern_image_array.h b/plugins/Clist_modern/hdr/modern_image_array.h
index 130c51ce95..130c51ce95 100644
--- a/plugins/Modernb/hdr/modern_image_array.h
+++ b/plugins/Clist_modern/hdr/modern_image_array.h
diff --git a/plugins/Modernb/hdr/modern_layered_window_engine.h b/plugins/Clist_modern/hdr/modern_layered_window_engine.h
index 918bfabf37..918bfabf37 100644
--- a/plugins/Modernb/hdr/modern_layered_window_engine.h
+++ b/plugins/Clist_modern/hdr/modern_layered_window_engine.h
diff --git a/plugins/Modernb/hdr/modern_log.h b/plugins/Clist_modern/hdr/modern_log.h
index 0696c280bd..0696c280bd 100644
--- a/plugins/Modernb/hdr/modern_log.h
+++ b/plugins/Clist_modern/hdr/modern_log.h
diff --git a/plugins/Modernb/hdr/modern_popup.h b/plugins/Clist_modern/hdr/modern_popup.h
index d333ab1e36..d333ab1e36 100644
--- a/plugins/Modernb/hdr/modern_popup.h
+++ b/plugins/Clist_modern/hdr/modern_popup.h
diff --git a/plugins/Modernb/hdr/modern_row.h b/plugins/Clist_modern/hdr/modern_row.h
index 47b9582c29..47b9582c29 100644
--- a/plugins/Modernb/hdr/modern_row.h
+++ b/plugins/Clist_modern/hdr/modern_row.h
diff --git a/plugins/Modernb/hdr/modern_rowheight_funcs.h b/plugins/Clist_modern/hdr/modern_rowheight_funcs.h
index 57223cf3c0..57223cf3c0 100644
--- a/plugins/Modernb/hdr/modern_rowheight_funcs.h
+++ b/plugins/Clist_modern/hdr/modern_rowheight_funcs.h
diff --git a/plugins/Modernb/hdr/modern_skinengine.h b/plugins/Clist_modern/hdr/modern_skinengine.h
index a2b365b2ba..a2b365b2ba 100644
--- a/plugins/Modernb/hdr/modern_skinengine.h
+++ b/plugins/Clist_modern/hdr/modern_skinengine.h
diff --git a/plugins/Modernb/hdr/modern_skinned_profile.h b/plugins/Clist_modern/hdr/modern_skinned_profile.h
index 95ab85c606..95ab85c606 100644
--- a/plugins/Modernb/hdr/modern_skinned_profile.h
+++ b/plugins/Clist_modern/hdr/modern_skinned_profile.h
diff --git a/plugins/Modernb/hdr/modern_skinselector.h b/plugins/Clist_modern/hdr/modern_skinselector.h
index 9509695ad3..9509695ad3 100644
--- a/plugins/Modernb/hdr/modern_skinselector.h
+++ b/plugins/Clist_modern/hdr/modern_skinselector.h
diff --git a/plugins/Modernb/hdr/modern_static_clui.h b/plugins/Clist_modern/hdr/modern_static_clui.h
index e03008951b..e03008951b 100644
--- a/plugins/Modernb/hdr/modern_static_clui.h
+++ b/plugins/Clist_modern/hdr/modern_static_clui.h
diff --git a/plugins/Modernb/hdr/modern_static_cluiframes_service.h b/plugins/Clist_modern/hdr/modern_static_cluiframes_service.h
index 34403ad8cd..34403ad8cd 100644
--- a/plugins/Modernb/hdr/modern_static_cluiframes_service.h
+++ b/plugins/Clist_modern/hdr/modern_static_cluiframes_service.h
diff --git a/plugins/Modernb/hdr/modern_statusbar.h b/plugins/Clist_modern/hdr/modern_statusbar.h
index 65d0ca2e57..65d0ca2e57 100644
--- a/plugins/Modernb/hdr/modern_statusbar.h
+++ b/plugins/Clist_modern/hdr/modern_statusbar.h
diff --git a/plugins/Modernb/hdr/modern_statusmodes.h b/plugins/Clist_modern/hdr/modern_statusmodes.h
index f69f97abd9..f69f97abd9 100644
--- a/plugins/Modernb/hdr/modern_statusmodes.h
+++ b/plugins/Clist_modern/hdr/modern_statusmodes.h
diff --git a/plugins/Modernb/hdr/modern_sync.h b/plugins/Clist_modern/hdr/modern_sync.h
index 34686470e5..34686470e5 100644
--- a/plugins/Modernb/hdr/modern_sync.h
+++ b/plugins/Clist_modern/hdr/modern_sync.h
diff --git a/plugins/Modernb/hdr/modern_tstring.h b/plugins/Clist_modern/hdr/modern_tstring.h
index 5bd558c54d..5bd558c54d 100644
--- a/plugins/Modernb/hdr/modern_tstring.h
+++ b/plugins/Clist_modern/hdr/modern_tstring.h
diff --git a/plugins/Modernb/icons_pack/ICONS.rc b/plugins/Clist_modern/icons_pack/ICONS.rc
index 287d4d44f5..287d4d44f5 100644
--- a/plugins/Modernb/icons_pack/ICONS.rc
+++ b/plugins/Clist_modern/icons_pack/ICONS.rc
diff --git a/plugins/Modernb/icons_pack/ICONS_10.vcxproj b/plugins/Clist_modern/icons_pack/ICONS_10.vcxproj
index 0aa9cd7323..0aa9cd7323 100644
--- a/plugins/Modernb/icons_pack/ICONS_10.vcxproj
+++ b/plugins/Clist_modern/icons_pack/ICONS_10.vcxproj
diff --git a/plugins/Modernb/icons_pack/icon_resource.h b/plugins/Clist_modern/icons_pack/icon_resource.h
index c9f5c0f94a..c9f5c0f94a 100644
--- a/plugins/Modernb/icons_pack/icon_resource.h
+++ b/plugins/Clist_modern/icons_pack/icon_resource.h
diff --git a/plugins/Modernb/icons_pack/icos/icon_accmgr.ico b/plugins/Clist_modern/icons_pack/icos/icon_accmgr.ico
index 776b989fe3..776b989fe3 100644
--- a/plugins/Modernb/icons_pack/icos/icon_accmgr.ico
+++ b/plugins/Clist_modern/icons_pack/icos/icon_accmgr.ico
diff --git a/plugins/Modernb/icons_pack/icos/icon_bookmarks.ico b/plugins/Clist_modern/icons_pack/icos/icon_bookmarks.ico
index 469090ed61..469090ed61 100644
--- a/plugins/Modernb/icons_pack/icos/icon_bookmarks.ico
+++ b/plugins/Clist_modern/icons_pack/icos/icon_bookmarks.ico
diff --git a/plugins/Modernb/icons_pack/icos/icon_dbeditor.ico b/plugins/Clist_modern/icons_pack/icos/icon_dbeditor.ico
index 4218d610f5..4218d610f5 100644
--- a/plugins/Modernb/icons_pack/icos/icon_dbeditor.ico
+++ b/plugins/Clist_modern/icons_pack/icos/icon_dbeditor.ico
diff --git a/plugins/Modernb/icons_pack/icos/icon_find_user.ico b/plugins/Clist_modern/icons_pack/icos/icon_find_user.ico
index 2091d72960..2091d72960 100644
--- a/plugins/Modernb/icons_pack/icos/icon_find_user.ico
+++ b/plugins/Clist_modern/icons_pack/icos/icon_find_user.ico
diff --git a/plugins/Modernb/icons_pack/icos/icon_groups_off.ico b/plugins/Clist_modern/icons_pack/icos/icon_groups_off.ico
index 6baf9d9d3d..6baf9d9d3d 100644
--- a/plugins/Modernb/icons_pack/icos/icon_groups_off.ico
+++ b/plugins/Clist_modern/icons_pack/icos/icon_groups_off.ico
diff --git a/plugins/Modernb/icons_pack/icos/icon_groups_on.ico b/plugins/Clist_modern/icons_pack/icos/icon_groups_on.ico
index 9416f143f7..9416f143f7 100644
--- a/plugins/Modernb/icons_pack/icos/icon_groups_on.ico
+++ b/plugins/Clist_modern/icons_pack/icos/icon_groups_on.ico
diff --git a/plugins/Modernb/icons_pack/icos/icon_hideoffline.ico b/plugins/Clist_modern/icons_pack/icos/icon_hideoffline.ico
index 428ffc68e8..428ffc68e8 100644
--- a/plugins/Modernb/icons_pack/icos/icon_hideoffline.ico
+++ b/plugins/Clist_modern/icons_pack/icos/icon_hideoffline.ico
diff --git a/plugins/Modernb/icons_pack/icos/icon_mainmenu.ico b/plugins/Clist_modern/icons_pack/icos/icon_mainmenu.ico
index b57331093d..b57331093d 100644
--- a/plugins/Modernb/icons_pack/icos/icon_mainmenu.ico
+++ b/plugins/Clist_modern/icons_pack/icos/icon_mainmenu.ico
diff --git a/plugins/Modernb/icons_pack/icos/icon_minimize.ico b/plugins/Clist_modern/icons_pack/icos/icon_minimize.ico
index f52668220b..f52668220b 100644
--- a/plugins/Modernb/icons_pack/icos/icon_minimize.ico
+++ b/plugins/Clist_modern/icons_pack/icos/icon_minimize.ico
diff --git a/plugins/Modernb/icons_pack/icos/icon_options.ico b/plugins/Clist_modern/icons_pack/icos/icon_options.ico
index 3529a5baf9..3529a5baf9 100644
--- a/plugins/Modernb/icons_pack/icos/icon_options.ico
+++ b/plugins/Clist_modern/icons_pack/icos/icon_options.ico
diff --git a/plugins/Modernb/icons_pack/icos/icon_showoffline.ico b/plugins/Clist_modern/icons_pack/icos/icon_showoffline.ico
index 70f8e21200..70f8e21200 100644
--- a/plugins/Modernb/icons_pack/icos/icon_showoffline.ico
+++ b/plugins/Clist_modern/icons_pack/icos/icon_showoffline.ico
diff --git a/plugins/Modernb/icons_pack/icos/icon_sounds_off.ico b/plugins/Clist_modern/icons_pack/icos/icon_sounds_off.ico
index a4d8f9093d..a4d8f9093d 100644
--- a/plugins/Modernb/icons_pack/icos/icon_sounds_off.ico
+++ b/plugins/Clist_modern/icons_pack/icos/icon_sounds_off.ico
diff --git a/plugins/Modernb/icons_pack/icos/icon_sounds_on.ico b/plugins/Clist_modern/icons_pack/icos/icon_sounds_on.ico
index 65c67c2386..65c67c2386 100644
--- a/plugins/Modernb/icons_pack/icos/icon_sounds_on.ico
+++ b/plugins/Clist_modern/icons_pack/icos/icon_sounds_on.ico
diff --git a/plugins/Modernb/icons_pack/icos/icon_statusmenu.ico b/plugins/Clist_modern/icons_pack/icos/icon_statusmenu.ico
index 44681552fd..44681552fd 100644
--- a/plugins/Modernb/icons_pack/icos/icon_statusmenu.ico
+++ b/plugins/Clist_modern/icons_pack/icos/icon_statusmenu.ico
diff --git a/plugins/Modernb/init.cpp b/plugins/Clist_modern/init.cpp
index 7ca3ed79ab..7ca3ed79ab 100644
--- a/plugins/Modernb/init.cpp
+++ b/plugins/Clist_modern/init.cpp
diff --git a/plugins/Modernb/m_api/m_skin_eng.h b/plugins/Clist_modern/m_api/m_skin_eng.h
index 78de34e2bb..78de34e2bb 100644
--- a/plugins/Modernb/m_api/m_skin_eng.h
+++ b/plugins/Clist_modern/m_api/m_skin_eng.h
diff --git a/plugins/Modernb/m_api/m_skinbutton.h b/plugins/Clist_modern/m_api/m_skinbutton.h
index 86634cb566..86634cb566 100644
--- a/plugins/Modernb/m_api/m_skinbutton.h
+++ b/plugins/Clist_modern/m_api/m_skinbutton.h
diff --git a/plugins/Modernb/m_api/m_skinned_profile.h b/plugins/Clist_modern/m_api/m_skinned_profile.h
index 0b0932bac6..0b0932bac6 100644
--- a/plugins/Modernb/m_api/m_skinned_profile.h
+++ b/plugins/Clist_modern/m_api/m_skinned_profile.h
diff --git a/plugins/Modernb/m_api/m_xpTheme.h b/plugins/Clist_modern/m_api/m_xpTheme.h
index 63f1b0a5d3..63f1b0a5d3 100644
--- a/plugins/Modernb/m_api/m_xpTheme.h
+++ b/plugins/Clist_modern/m_api/m_xpTheme.h
diff --git a/plugins/Modernb/modern_aniavatars.cpp b/plugins/Clist_modern/modern_aniavatars.cpp
index dcad45f439..dcad45f439 100644
--- a/plugins/Modernb/modern_aniavatars.cpp
+++ b/plugins/Clist_modern/modern_aniavatars.cpp
diff --git a/plugins/Modernb/modern_awaymsg.cpp b/plugins/Clist_modern/modern_awaymsg.cpp
index 97f2550a32..97f2550a32 100644
--- a/plugins/Modernb/modern_awaymsg.cpp
+++ b/plugins/Clist_modern/modern_awaymsg.cpp
diff --git a/plugins/Modernb/modern_cachefuncs.cpp b/plugins/Clist_modern/modern_cachefuncs.cpp
index 46e0d40b03..46e0d40b03 100644
--- a/plugins/Modernb/modern_cachefuncs.cpp
+++ b/plugins/Clist_modern/modern_cachefuncs.cpp
diff --git a/plugins/Modernb/modern_callproc.cpp b/plugins/Clist_modern/modern_callproc.cpp
index ab26eb03eb..ab26eb03eb 100644
--- a/plugins/Modernb/modern_callproc.cpp
+++ b/plugins/Clist_modern/modern_callproc.cpp
diff --git a/plugins/Modernb/modern_clc.cpp b/plugins/Clist_modern/modern_clc.cpp
index bc7a5a4f66..bc7a5a4f66 100644
--- a/plugins/Modernb/modern_clc.cpp
+++ b/plugins/Clist_modern/modern_clc.cpp
diff --git a/plugins/Modernb/modern_clcidents.cpp b/plugins/Clist_modern/modern_clcidents.cpp
index b6106439bc..b6106439bc 100644
--- a/plugins/Modernb/modern_clcidents.cpp
+++ b/plugins/Clist_modern/modern_clcidents.cpp
diff --git a/plugins/Modernb/modern_clcitems.cpp b/plugins/Clist_modern/modern_clcitems.cpp
index 367bbb57de..367bbb57de 100644
--- a/plugins/Modernb/modern_clcitems.cpp
+++ b/plugins/Clist_modern/modern_clcitems.cpp
diff --git a/plugins/Modernb/modern_clcmsgs.cpp b/plugins/Clist_modern/modern_clcmsgs.cpp
index 6a444d32ac..6a444d32ac 100644
--- a/plugins/Modernb/modern_clcmsgs.cpp
+++ b/plugins/Clist_modern/modern_clcmsgs.cpp
diff --git a/plugins/Modernb/modern_clcopts.cpp b/plugins/Clist_modern/modern_clcopts.cpp
index 91b3f15bf8..91b3f15bf8 100644
--- a/plugins/Modernb/modern_clcopts.cpp
+++ b/plugins/Clist_modern/modern_clcopts.cpp
diff --git a/plugins/Modernb/modern_clcpaint.cpp b/plugins/Clist_modern/modern_clcpaint.cpp
index edc043da0f..edc043da0f 100644
--- a/plugins/Modernb/modern_clcpaint.cpp
+++ b/plugins/Clist_modern/modern_clcpaint.cpp
diff --git a/plugins/Modernb/modern_clcutils.cpp b/plugins/Clist_modern/modern_clcutils.cpp
index 5ba8924e8c..5ba8924e8c 100644
--- a/plugins/Modernb/modern_clcutils.cpp
+++ b/plugins/Clist_modern/modern_clcutils.cpp
diff --git a/plugins/Modernb/modern_clistevents.cpp b/plugins/Clist_modern/modern_clistevents.cpp
index 1c938a83aa..1c938a83aa 100644
--- a/plugins/Modernb/modern_clistevents.cpp
+++ b/plugins/Clist_modern/modern_clistevents.cpp
diff --git a/plugins/Modernb/modern_clistmenus.cpp b/plugins/Clist_modern/modern_clistmenus.cpp
index 95e41c4d81..95e41c4d81 100644
--- a/plugins/Modernb/modern_clistmenus.cpp
+++ b/plugins/Clist_modern/modern_clistmenus.cpp
diff --git a/plugins/Modernb/modern_clistmod.cpp b/plugins/Clist_modern/modern_clistmod.cpp
index baa92d5e95..baa92d5e95 100644
--- a/plugins/Modernb/modern_clistmod.cpp
+++ b/plugins/Clist_modern/modern_clistmod.cpp
diff --git a/plugins/Modernb/modern_clistopts.cpp b/plugins/Clist_modern/modern_clistopts.cpp
index 07092018a0..07092018a0 100644
--- a/plugins/Modernb/modern_clistopts.cpp
+++ b/plugins/Clist_modern/modern_clistopts.cpp
diff --git a/plugins/Modernb/modern_clistsettings.cpp b/plugins/Clist_modern/modern_clistsettings.cpp
index 759b1ed8e3..759b1ed8e3 100644
--- a/plugins/Modernb/modern_clistsettings.cpp
+++ b/plugins/Clist_modern/modern_clistsettings.cpp
diff --git a/plugins/Modernb/modern_clisttray.cpp b/plugins/Clist_modern/modern_clisttray.cpp
index 15c26506c8..15c26506c8 100644
--- a/plugins/Modernb/modern_clisttray.cpp
+++ b/plugins/Clist_modern/modern_clisttray.cpp
diff --git a/plugins/Modernb/modern_clui.cpp b/plugins/Clist_modern/modern_clui.cpp
index 8830f119d6..8830f119d6 100644
--- a/plugins/Modernb/modern_clui.cpp
+++ b/plugins/Clist_modern/modern_clui.cpp
diff --git a/plugins/Modernb/modern_cluiframes.cpp b/plugins/Clist_modern/modern_cluiframes.cpp
index ee88e5a4de..ee88e5a4de 100644
--- a/plugins/Modernb/modern_cluiframes.cpp
+++ b/plugins/Clist_modern/modern_cluiframes.cpp
diff --git a/plugins/Modernb/modern_cluiservices.cpp b/plugins/Clist_modern/modern_cluiservices.cpp
index e237c2a125..e237c2a125 100644
--- a/plugins/Modernb/modern_cluiservices.cpp
+++ b/plugins/Clist_modern/modern_cluiservices.cpp
diff --git a/plugins/Modernb/modern_commonheaders.cpp b/plugins/Clist_modern/modern_commonheaders.cpp
index eb78d351c7..eb78d351c7 100644
--- a/plugins/Modernb/modern_commonheaders.cpp
+++ b/plugins/Clist_modern/modern_commonheaders.cpp
diff --git a/plugins/Modernb/modern_contact.cpp b/plugins/Clist_modern/modern_contact.cpp
index 23e98b695a..23e98b695a 100644
--- a/plugins/Modernb/modern_contact.cpp
+++ b/plugins/Clist_modern/modern_contact.cpp
diff --git a/plugins/Modernb/modern_docking.cpp b/plugins/Clist_modern/modern_docking.cpp
index a7ffe8e506..a7ffe8e506 100644
--- a/plugins/Modernb/modern_docking.cpp
+++ b/plugins/Clist_modern/modern_docking.cpp
diff --git a/plugins/Modernb/modern_extraimage.cpp b/plugins/Clist_modern/modern_extraimage.cpp
index 6f145d3c79..6f145d3c79 100644
--- a/plugins/Modernb/modern_extraimage.cpp
+++ b/plugins/Clist_modern/modern_extraimage.cpp
diff --git a/plugins/Modernb/modern_framesmenu.cpp b/plugins/Clist_modern/modern_framesmenu.cpp
index 766adf4974..766adf4974 100644
--- a/plugins/Modernb/modern_framesmenu.cpp
+++ b/plugins/Clist_modern/modern_framesmenu.cpp
diff --git a/plugins/Modernb/modern_gdiplus.cpp b/plugins/Clist_modern/modern_gdiplus.cpp
index 4ab8604697..4ab8604697 100644
--- a/plugins/Modernb/modern_gdiplus.cpp
+++ b/plugins/Clist_modern/modern_gdiplus.cpp
diff --git a/plugins/Modernb/modern_gettextasync.cpp b/plugins/Clist_modern/modern_gettextasync.cpp
index c7dea9a18e..c7dea9a18e 100644
--- a/plugins/Modernb/modern_gettextasync.cpp
+++ b/plugins/Clist_modern/modern_gettextasync.cpp
diff --git a/plugins/Modernb/modern_global.cpp b/plugins/Clist_modern/modern_global.cpp
index b43dc5f163..b43dc5f163 100644
--- a/plugins/Modernb/modern_global.cpp
+++ b/plugins/Clist_modern/modern_global.cpp
diff --git a/plugins/Modernb/modern_groupmenu.cpp b/plugins/Clist_modern/modern_groupmenu.cpp
index 9d2b3780e6..9d2b3780e6 100644
--- a/plugins/Modernb/modern_groupmenu.cpp
+++ b/plugins/Clist_modern/modern_groupmenu.cpp
diff --git a/plugins/Modernb/modern_image_array.cpp b/plugins/Clist_modern/modern_image_array.cpp
index f8381ad9e6..f8381ad9e6 100644
--- a/plugins/Modernb/modern_image_array.cpp
+++ b/plugins/Clist_modern/modern_image_array.cpp
diff --git a/plugins/Modernb/modern_keyboard.cpp b/plugins/Clist_modern/modern_keyboard.cpp
index abc97debab..abc97debab 100644
--- a/plugins/Modernb/modern_keyboard.cpp
+++ b/plugins/Clist_modern/modern_keyboard.cpp
diff --git a/plugins/Modernb/modern_log.cpp b/plugins/Clist_modern/modern_log.cpp
index 2f44f59d8e..2f44f59d8e 100644
--- a/plugins/Modernb/modern_log.cpp
+++ b/plugins/Clist_modern/modern_log.cpp
diff --git a/plugins/Modernb/modern_newrowopts.cpp b/plugins/Clist_modern/modern_newrowopts.cpp
index fbd3ec60ed..fbd3ec60ed 100644
--- a/plugins/Modernb/modern_newrowopts.cpp
+++ b/plugins/Clist_modern/modern_newrowopts.cpp
diff --git a/plugins/Modernb/modern_popup.cpp b/plugins/Clist_modern/modern_popup.cpp
index 8fa33f370a..8fa33f370a 100644
--- a/plugins/Modernb/modern_popup.cpp
+++ b/plugins/Clist_modern/modern_popup.cpp
diff --git a/plugins/Modernb/modern_row.cpp b/plugins/Clist_modern/modern_row.cpp
index d7e9b51b58..d7e9b51b58 100644
--- a/plugins/Modernb/modern_row.cpp
+++ b/plugins/Clist_modern/modern_row.cpp
diff --git a/plugins/Modernb/modern_rowheight_funcs.cpp b/plugins/Clist_modern/modern_rowheight_funcs.cpp
index ac19b80a5c..ac19b80a5c 100644
--- a/plugins/Modernb/modern_rowheight_funcs.cpp
+++ b/plugins/Clist_modern/modern_rowheight_funcs.cpp
diff --git a/plugins/Modernb/modern_rowtemplateopt.cpp b/plugins/Clist_modern/modern_rowtemplateopt.cpp
index 756382b0f8..756382b0f8 100644
--- a/plugins/Modernb/modern_rowtemplateopt.cpp
+++ b/plugins/Clist_modern/modern_rowtemplateopt.cpp
diff --git a/plugins/Modernb/modern_skinbutton.cpp b/plugins/Clist_modern/modern_skinbutton.cpp
index cfbfa23b7e..cfbfa23b7e 100644
--- a/plugins/Modernb/modern_skinbutton.cpp
+++ b/plugins/Clist_modern/modern_skinbutton.cpp
diff --git a/plugins/Modernb/modern_skineditor.cpp b/plugins/Clist_modern/modern_skineditor.cpp
index 8684c3d53f..8684c3d53f 100644
--- a/plugins/Modernb/modern_skineditor.cpp
+++ b/plugins/Clist_modern/modern_skineditor.cpp
diff --git a/plugins/Modernb/modern_skinengine.cpp b/plugins/Clist_modern/modern_skinengine.cpp
index 487285304e..487285304e 100644
--- a/plugins/Modernb/modern_skinengine.cpp
+++ b/plugins/Clist_modern/modern_skinengine.cpp
diff --git a/plugins/Modernb/modern_skinned_profile.cpp b/plugins/Clist_modern/modern_skinned_profile.cpp
index d31fe7d18f..d31fe7d18f 100644
--- a/plugins/Modernb/modern_skinned_profile.cpp
+++ b/plugins/Clist_modern/modern_skinned_profile.cpp
diff --git a/plugins/Modernb/modern_skinopt.cpp b/plugins/Clist_modern/modern_skinopt.cpp
index adbbc6a895..adbbc6a895 100644
--- a/plugins/Modernb/modern_skinopt.cpp
+++ b/plugins/Clist_modern/modern_skinopt.cpp
diff --git a/plugins/Modernb/modern_skinselector.cpp b/plugins/Clist_modern/modern_skinselector.cpp
index 2540790d53..2540790d53 100644
--- a/plugins/Modernb/modern_skinselector.cpp
+++ b/plugins/Clist_modern/modern_skinselector.cpp
diff --git a/plugins/Modernb/modern_statusbar.cpp b/plugins/Clist_modern/modern_statusbar.cpp
index 5e7eb0bc3b..5e7eb0bc3b 100644
--- a/plugins/Modernb/modern_statusbar.cpp
+++ b/plugins/Clist_modern/modern_statusbar.cpp
diff --git a/plugins/Modernb/modern_statusbar_options.cpp b/plugins/Clist_modern/modern_statusbar_options.cpp
index 7bea01fe57..7bea01fe57 100644
--- a/plugins/Modernb/modern_statusbar_options.cpp
+++ b/plugins/Clist_modern/modern_statusbar_options.cpp
diff --git a/plugins/Modernb/modern_sync.cpp b/plugins/Clist_modern/modern_sync.cpp
index 1941b376f2..1941b376f2 100644
--- a/plugins/Modernb/modern_sync.cpp
+++ b/plugins/Clist_modern/modern_sync.cpp
diff --git a/plugins/Modernb/modern_tbbutton.cpp b/plugins/Clist_modern/modern_tbbutton.cpp
index f6dac962f5..f6dac962f5 100644
--- a/plugins/Modernb/modern_tbbutton.cpp
+++ b/plugins/Clist_modern/modern_tbbutton.cpp
diff --git a/plugins/Modernb/modern_toolbar.cpp b/plugins/Clist_modern/modern_toolbar.cpp
index 2c59d750f0..2c59d750f0 100644
--- a/plugins/Modernb/modern_toolbar.cpp
+++ b/plugins/Clist_modern/modern_toolbar.cpp
diff --git a/plugins/Modernb/modern_viewmodebar.cpp b/plugins/Clist_modern/modern_viewmodebar.cpp
index c896e3b852..c896e3b852 100644
--- a/plugins/Modernb/modern_viewmodebar.cpp
+++ b/plugins/Clist_modern/modern_viewmodebar.cpp
diff --git a/plugins/Modernb/modern_xptheme.cpp b/plugins/Clist_modern/modern_xptheme.cpp
index 599cb55010..599cb55010 100644
--- a/plugins/Modernb/modern_xptheme.cpp
+++ b/plugins/Clist_modern/modern_xptheme.cpp
diff --git a/plugins/Modernb/res/1.ico b/plugins/Clist_modern/res/1.ico
index 4fdb8d61de..4fdb8d61de 100644
--- a/plugins/Modernb/res/1.ico
+++ b/plugins/Clist_modern/res/1.ico
diff --git a/plugins/Modernb/res/2.ico b/plugins/Clist_modern/res/2.ico
index dc20b41a29..dc20b41a29 100644
--- a/plugins/Modernb/res/2.ico
+++ b/plugins/Clist_modern/res/2.ico
diff --git a/plugins/Modernb/res/3.ico b/plugins/Clist_modern/res/3.ico
index a9f7f62a92..a9f7f62a92 100644
--- a/plugins/Modernb/res/3.ico
+++ b/plugins/Clist_modern/res/3.ico
diff --git a/plugins/Modernb/res/4.ico b/plugins/Clist_modern/res/4.ico
index b1934f7b29..b1934f7b29 100644
--- a/plugins/Modernb/res/4.ico
+++ b/plugins/Clist_modern/res/4.ico
diff --git a/plugins/Modernb/res/5.ico b/plugins/Clist_modern/res/5.ico
index c8712ce8bc..c8712ce8bc 100644
--- a/plugins/Modernb/res/5.ico
+++ b/plugins/Clist_modern/res/5.ico
diff --git a/plugins/Modernb/res/6.ico b/plugins/Clist_modern/res/6.ico
index 8ecf10a068..8ecf10a068 100644
--- a/plugins/Modernb/res/6.ico
+++ b/plugins/Clist_modern/res/6.ico
diff --git a/plugins/Modernb/res/7.ico b/plugins/Clist_modern/res/7.ico
index 0525b3fc7d..0525b3fc7d 100644
--- a/plugins/Modernb/res/7.ico
+++ b/plugins/Clist_modern/res/7.ico
diff --git a/plugins/Modernb/res/8.ico b/plugins/Clist_modern/res/8.ico
index 7f917ee8be..7f917ee8be 100644
--- a/plugins/Modernb/res/8.ico
+++ b/plugins/Clist_modern/res/8.ico
diff --git a/plugins/Modernb/res/AlwaysVis.ico b/plugins/Clist_modern/res/AlwaysVis.ico
index 25c1a925ee..25c1a925ee 100644
--- a/plugins/Modernb/res/AlwaysVis.ico
+++ b/plugins/Clist_modern/res/AlwaysVis.ico
diff --git a/plugins/Modernb/res/Chatchannel.ico b/plugins/Clist_modern/res/Chatchannel.ico
index 0a1820c46e..0a1820c46e 100644
--- a/plugins/Modernb/res/Chatchannel.ico
+++ b/plugins/Clist_modern/res/Chatchannel.ico
diff --git a/plugins/Modernb/res/MicroAway.ico b/plugins/Clist_modern/res/MicroAway.ico
index efc12cf83d..efc12cf83d 100644
--- a/plugins/Modernb/res/MicroAway.ico
+++ b/plugins/Clist_modern/res/MicroAway.ico
diff --git a/plugins/Modernb/res/MicroChat.ico b/plugins/Clist_modern/res/MicroChat.ico
index 35a11902cc..35a11902cc 100644
--- a/plugins/Modernb/res/MicroChat.ico
+++ b/plugins/Clist_modern/res/MicroChat.ico
diff --git a/plugins/Modernb/res/MicroDnd.ico b/plugins/Clist_modern/res/MicroDnd.ico
index 2bf750f3cc..2bf750f3cc 100644
--- a/plugins/Modernb/res/MicroDnd.ico
+++ b/plugins/Clist_modern/res/MicroDnd.ico
diff --git a/plugins/Modernb/res/MicroInvisible.ico b/plugins/Clist_modern/res/MicroInvisible.ico
index 208c611d40..208c611d40 100644
--- a/plugins/Modernb/res/MicroInvisible.ico
+++ b/plugins/Clist_modern/res/MicroInvisible.ico
diff --git a/plugins/Modernb/res/MicroLunch.ico b/plugins/Clist_modern/res/MicroLunch.ico
index 1dc663bcc6..1dc663bcc6 100644
--- a/plugins/Modernb/res/MicroLunch.ico
+++ b/plugins/Clist_modern/res/MicroLunch.ico
diff --git a/plugins/Modernb/res/MicroNa.ico b/plugins/Clist_modern/res/MicroNa.ico
index 072f6e8d51..072f6e8d51 100644
--- a/plugins/Modernb/res/MicroNa.ico
+++ b/plugins/Clist_modern/res/MicroNa.ico
diff --git a/plugins/Modernb/res/MicroOccupied.ico b/plugins/Clist_modern/res/MicroOccupied.ico
index 5b3a18f097..5b3a18f097 100644
--- a/plugins/Modernb/res/MicroOccupied.ico
+++ b/plugins/Clist_modern/res/MicroOccupied.ico
diff --git a/plugins/Modernb/res/MicroOffline.ico b/plugins/Clist_modern/res/MicroOffline.ico
index 2e5b1dff5d..2e5b1dff5d 100644
--- a/plugins/Modernb/res/MicroOffline.ico
+++ b/plugins/Clist_modern/res/MicroOffline.ico
diff --git a/plugins/Modernb/res/MicroPhone.ico b/plugins/Clist_modern/res/MicroPhone.ico
index 6750226755..6750226755 100644
--- a/plugins/Modernb/res/MicroPhone.ico
+++ b/plugins/Clist_modern/res/MicroPhone.ico
diff --git a/plugins/Modernb/res/NA.ico b/plugins/Clist_modern/res/NA.ico
index 9290436f5d..9290436f5d 100644
--- a/plugins/Modernb/res/NA.ico
+++ b/plugins/Clist_modern/res/NA.ico
diff --git a/plugins/Modernb/res/NeverVis.ico b/plugins/Clist_modern/res/NeverVis.ico
index 131ae02580..131ae02580 100644
--- a/plugins/Modernb/res/NeverVis.ico
+++ b/plugins/Clist_modern/res/NeverVis.ico
diff --git a/plugins/Modernb/res/addgoupp.ico b/plugins/Clist_modern/res/addgoupp.ico
index b531d4a06e..b531d4a06e 100644
--- a/plugins/Modernb/res/addgoupp.ico
+++ b/plugins/Clist_modern/res/addgoupp.ico
diff --git a/plugins/Modernb/res/away.ico b/plugins/Clist_modern/res/away.ico
index c21398e351..c21398e351 100644
--- a/plugins/Modernb/res/away.ico
+++ b/plugins/Clist_modern/res/away.ico
diff --git a/plugins/Modernb/res/back.tga b/plugins/Clist_modern/res/back.tga
index a90d5a5bba..a90d5a5bba 100644
--- a/plugins/Modernb/res/back.tga
+++ b/plugins/Clist_modern/res/back.tga
diff --git a/plugins/Modernb/res/chat.ico b/plugins/Clist_modern/res/chat.ico
index 0239c56093..0239c56093 100644
--- a/plugins/Modernb/res/chat.ico
+++ b/plugins/Clist_modern/res/chat.ico
diff --git a/plugins/Modernb/res/dnd.ico b/plugins/Clist_modern/res/dnd.ico
index e90c47f85c..e90c47f85c 100644
--- a/plugins/Modernb/res/dnd.ico
+++ b/plugins/Clist_modern/res/dnd.ico
diff --git a/plugins/Modernb/res/hide_avatar.ico b/plugins/Clist_modern/res/hide_avatar.ico
index 1be27b2461..1be27b2461 100644
--- a/plugins/Modernb/res/hide_avatar.ico
+++ b/plugins/Clist_modern/res/hide_avatar.ico
diff --git a/plugins/Modernb/res/invisible.ico b/plugins/Clist_modern/res/invisible.ico
index 8b7a375e22..8b7a375e22 100644
--- a/plugins/Modernb/res/invisible.ico
+++ b/plugins/Clist_modern/res/invisible.ico
diff --git a/plugins/Modernb/res/listening_to.ico b/plugins/Clist_modern/res/listening_to.ico
index a9af00c6dd..a9af00c6dd 100644
--- a/plugins/Modernb/res/listening_to.ico
+++ b/plugins/Clist_modern/res/listening_to.ico
diff --git a/plugins/Modernb/res/lunch.ico b/plugins/Clist_modern/res/lunch.ico
index 5567fe052a..5567fe052a 100644
--- a/plugins/Modernb/res/lunch.ico
+++ b/plugins/Clist_modern/res/lunch.ico
diff --git a/plugins/Modernb/res/neo_meta_create.cur b/plugins/Clist_modern/res/neo_meta_create.cur
index e9886f92fe..e9886f92fe 100644
--- a/plugins/Modernb/res/neo_meta_create.cur
+++ b/plugins/Clist_modern/res/neo_meta_create.cur
diff --git a/plugins/Modernb/res/neo_meta_default.cur b/plugins/Clist_modern/res/neo_meta_default.cur
index b9bc783921..b9bc783921 100644
--- a/plugins/Modernb/res/neo_meta_default.cur
+++ b/plugins/Clist_modern/res/neo_meta_default.cur
diff --git a/plugins/Modernb/res/neo_meta_move.cur b/plugins/Clist_modern/res/neo_meta_move.cur
index d1a35440df..d1a35440df 100644
--- a/plugins/Modernb/res/neo_meta_move.cur
+++ b/plugins/Clist_modern/res/neo_meta_move.cur
diff --git a/plugins/Modernb/res/occupied.ico b/plugins/Clist_modern/res/occupied.ico
index 6df6902ed7..6df6902ed7 100644
--- a/plugins/Modernb/res/occupied.ico
+++ b/plugins/Clist_modern/res/occupied.ico
diff --git a/plugins/Modernb/res/offline.ico b/plugins/Clist_modern/res/offline.ico
index 5924d8d5f8..5924d8d5f8 100644
--- a/plugins/Modernb/res/offline.ico
+++ b/plugins/Clist_modern/res/offline.ico
diff --git a/plugins/Modernb/res/phone.ico b/plugins/Clist_modern/res/phone.ico
index 50ca4e9cfd..50ca4e9cfd 100644
--- a/plugins/Modernb/res/phone.ico
+++ b/plugins/Clist_modern/res/phone.ico
diff --git a/plugins/Modernb/res/rate_high.ico b/plugins/Clist_modern/res/rate_high.ico
index 47e9d0fafd..47e9d0fafd 100644
--- a/plugins/Modernb/res/rate_high.ico
+++ b/plugins/Clist_modern/res/rate_high.ico
diff --git a/plugins/Modernb/res/rate_low.ico b/plugins/Clist_modern/res/rate_low.ico
index b26769550d..b26769550d 100644
--- a/plugins/Modernb/res/rate_low.ico
+++ b/plugins/Clist_modern/res/rate_low.ico
diff --git a/plugins/Modernb/res/rate_med.ico b/plugins/Clist_modern/res/rate_med.ico
index c503b5951f..c503b5951f 100644
--- a/plugins/Modernb/res/rate_med.ico
+++ b/plugins/Clist_modern/res/rate_med.ico
diff --git a/plugins/Modernb/res/rate_none.ico b/plugins/Clist_modern/res/rate_none.ico
index 6278c9c97c..6278c9c97c 100644
--- a/plugins/Modernb/res/rate_none.ico
+++ b/plugins/Clist_modern/res/rate_none.ico
diff --git a/plugins/Modernb/res/reset_view.ico b/plugins/Clist_modern/res/reset_view.ico
index cd5624bc59..cd5624bc59 100644
--- a/plugins/Modernb/res/reset_view.ico
+++ b/plugins/Clist_modern/res/reset_view.ico
diff --git a/plugins/Modernb/res/set_view.ico b/plugins/Clist_modern/res/set_view.ico
index b303433bf3..b303433bf3 100644
--- a/plugins/Modernb/res/set_view.ico
+++ b/plugins/Clist_modern/res/set_view.ico
diff --git a/plugins/Modernb/res/show_avatar.ico b/plugins/Clist_modern/res/show_avatar.ico
index 3525625479..3525625479 100644
--- a/plugins/Modernb/res/show_avatar.ico
+++ b/plugins/Clist_modern/res/show_avatar.ico
diff --git a/plugins/Modernb/res/skin.msf b/plugins/Clist_modern/res/skin.msf
index d7efd37eff..d7efd37eff 100644
--- a/plugins/Modernb/res/skin.msf
+++ b/plugins/Clist_modern/res/skin.msf
diff --git a/plugins/Modernb/resource.h b/plugins/Clist_modern/resource.h
index e9e7a01b5f..e9e7a01b5f 100644
--- a/plugins/Modernb/resource.h
+++ b/plugins/Clist_modern/resource.h
diff --git a/plugins/Modernb/resource.rc b/plugins/Clist_modern/resource.rc
index 9bdb0e174e..9bdb0e174e 100644
--- a/plugins/Modernb/resource.rc
+++ b/plugins/Clist_modern/resource.rc
diff --git a/plugins/Modernb/version.h b/plugins/Clist_modern/version.h
index 21d3c8e694..21d3c8e694 100644
--- a/plugins/Modernb/version.h
+++ b/plugins/Clist_modern/version.h
diff --git a/plugins/Modernb/version.rc b/plugins/Clist_modern/version.rc
index cd673b369d..cd673b369d 100644
--- a/plugins/Modernb/version.rc
+++ b/plugins/Clist_modern/version.rc
diff --git a/plugins/Mwclist/BkgrCfg.cpp b/plugins/Clist_mw/BkgrCfg.cpp
index c24974ccc7..c24974ccc7 100644
--- a/plugins/Mwclist/BkgrCfg.cpp
+++ b/plugins/Clist_mw/BkgrCfg.cpp
diff --git a/plugins/Mwclist/BkgrCfg.h b/plugins/Clist_mw/BkgrCfg.h
index a47b53a603..a47b53a603 100644
--- a/plugins/Mwclist/BkgrCfg.h
+++ b/plugins/Clist_mw/BkgrCfg.h
diff --git a/plugins/Mwclist/CLUIFrames/cluiframes.cpp b/plugins/Clist_mw/CLUIFrames/cluiframes.cpp
index ab56da832d..ab56da832d 100644
--- a/plugins/Mwclist/CLUIFrames/cluiframes.cpp
+++ b/plugins/Clist_mw/CLUIFrames/cluiframes.cpp
diff --git a/plugins/Mwclist/CLUIFrames/cluiframes.h b/plugins/Clist_mw/CLUIFrames/cluiframes.h
index 6430c6655d..6430c6655d 100644
--- a/plugins/Mwclist/CLUIFrames/cluiframes.h
+++ b/plugins/Clist_mw/CLUIFrames/cluiframes.h
diff --git a/plugins/Mwclist/CLUIFrames/extraimage.cpp b/plugins/Clist_mw/CLUIFrames/extraimage.cpp
index 4cec640ebb..4cec640ebb 100644
--- a/plugins/Mwclist/CLUIFrames/extraimage.cpp
+++ b/plugins/Clist_mw/CLUIFrames/extraimage.cpp
diff --git a/plugins/Mwclist/CLUIFrames/framesmenu.cpp b/plugins/Clist_mw/CLUIFrames/framesmenu.cpp
index 7ce6bdd2a1..7ce6bdd2a1 100644
--- a/plugins/Mwclist/CLUIFrames/framesmenu.cpp
+++ b/plugins/Clist_mw/CLUIFrames/framesmenu.cpp
diff --git a/plugins/Mwclist/CLUIFrames/statusbar.cpp b/plugins/Clist_mw/CLUIFrames/statusbar.cpp
index 319f4f8f63..319f4f8f63 100644
--- a/plugins/Mwclist/CLUIFrames/statusbar.cpp
+++ b/plugins/Clist_mw/CLUIFrames/statusbar.cpp
diff --git a/plugins/Mwclist/clc.cpp b/plugins/Clist_mw/clc.cpp
index 4975eda998..4975eda998 100644
--- a/plugins/Mwclist/clc.cpp
+++ b/plugins/Clist_mw/clc.cpp
diff --git a/plugins/Mwclist/clc.h b/plugins/Clist_mw/clc.h
index 6bb37c2beb..6bb37c2beb 100644
--- a/plugins/Mwclist/clc.h
+++ b/plugins/Clist_mw/clc.h
diff --git a/plugins/Mwclist/clcfonts.cpp b/plugins/Clist_mw/clcfonts.cpp
index 346c53c9f3..346c53c9f3 100644
--- a/plugins/Mwclist/clcfonts.cpp
+++ b/plugins/Clist_mw/clcfonts.cpp
diff --git a/plugins/Mwclist/clcidents.cpp b/plugins/Clist_mw/clcidents.cpp
index 1cc940db2b..1cc940db2b 100644
--- a/plugins/Mwclist/clcidents.cpp
+++ b/plugins/Clist_mw/clcidents.cpp
diff --git a/plugins/Mwclist/clcitems.cpp b/plugins/Clist_mw/clcitems.cpp
index ae69b6ee42..ae69b6ee42 100644
--- a/plugins/Mwclist/clcitems.cpp
+++ b/plugins/Clist_mw/clcitems.cpp
diff --git a/plugins/Mwclist/clcopts.cpp b/plugins/Clist_mw/clcopts.cpp
index 32de8b13f6..32de8b13f6 100644
--- a/plugins/Mwclist/clcopts.cpp
+++ b/plugins/Clist_mw/clcopts.cpp
diff --git a/plugins/Mwclist/clcpaint.cpp b/plugins/Clist_mw/clcpaint.cpp
index 952ef930f2..952ef930f2 100644
--- a/plugins/Mwclist/clcpaint.cpp
+++ b/plugins/Clist_mw/clcpaint.cpp
diff --git a/plugins/Mwclist/clcutils.cpp b/plugins/Clist_mw/clcutils.cpp
index e9253b4082..e9253b4082 100644
--- a/plugins/Mwclist/clcutils.cpp
+++ b/plugins/Clist_mw/clcutils.cpp
diff --git a/plugins/Mwclist/clist.h b/plugins/Clist_mw/clist.h
index 32effbad84..32effbad84 100644
--- a/plugins/Mwclist/clist.h
+++ b/plugins/Clist_mw/clist.h
diff --git a/plugins/Mwclist/clist_mw_10.vcxproj b/plugins/Clist_mw/clist_mw_10.vcxproj
index 300de1314b..300de1314b 100644
--- a/plugins/Mwclist/clist_mw_10.vcxproj
+++ b/plugins/Clist_mw/clist_mw_10.vcxproj
diff --git a/plugins/Mwclist/clist_mw_10.vcxproj.filters b/plugins/Clist_mw/clist_mw_10.vcxproj.filters
index 4573d41161..4573d41161 100644
--- a/plugins/Mwclist/clist_mw_10.vcxproj.filters
+++ b/plugins/Clist_mw/clist_mw_10.vcxproj.filters
diff --git a/plugins/Mwclist/clistmenus.cpp b/plugins/Clist_mw/clistmenus.cpp
index db84dca927..db84dca927 100644
--- a/plugins/Mwclist/clistmenus.cpp
+++ b/plugins/Clist_mw/clistmenus.cpp
diff --git a/plugins/Mwclist/clistmod.cpp b/plugins/Clist_mw/clistmod.cpp
index 6551c8d03e..6551c8d03e 100644
--- a/plugins/Mwclist/clistmod.cpp
+++ b/plugins/Clist_mw/clistmod.cpp
diff --git a/plugins/Mwclist/clistopts.cpp b/plugins/Clist_mw/clistopts.cpp
index 947d68da69..947d68da69 100644
--- a/plugins/Mwclist/clistopts.cpp
+++ b/plugins/Clist_mw/clistopts.cpp
diff --git a/plugins/Mwclist/clistsettings.cpp b/plugins/Clist_mw/clistsettings.cpp
index 24275f4362..24275f4362 100644
--- a/plugins/Mwclist/clistsettings.cpp
+++ b/plugins/Clist_mw/clistsettings.cpp
diff --git a/plugins/Mwclist/clisttray.cpp b/plugins/Clist_mw/clisttray.cpp
index d0e6e3ae93..d0e6e3ae93 100644
--- a/plugins/Mwclist/clisttray.cpp
+++ b/plugins/Clist_mw/clisttray.cpp
diff --git a/plugins/Mwclist/clui.cpp b/plugins/Clist_mw/clui.cpp
index f8a820bca6..f8a820bca6 100644
--- a/plugins/Mwclist/clui.cpp
+++ b/plugins/Clist_mw/clui.cpp
diff --git a/plugins/Mwclist/cluiopts.cpp b/plugins/Clist_mw/cluiopts.cpp
index 33fc3abaf4..33fc3abaf4 100644
--- a/plugins/Mwclist/cluiopts.cpp
+++ b/plugins/Clist_mw/cluiopts.cpp
diff --git a/plugins/Mwclist/cluiservices.cpp b/plugins/Clist_mw/cluiservices.cpp
index f75fbc9dac..f75fbc9dac 100644
--- a/plugins/Mwclist/cluiservices.cpp
+++ b/plugins/Clist_mw/cluiservices.cpp
diff --git a/plugins/Mwclist/commonheaders.cpp b/plugins/Clist_mw/commonheaders.cpp
index df68c5385c..df68c5385c 100644
--- a/plugins/Mwclist/commonheaders.cpp
+++ b/plugins/Clist_mw/commonheaders.cpp
diff --git a/plugins/Mwclist/commonheaders.h b/plugins/Clist_mw/commonheaders.h
index e8333401b2..e8333401b2 100644
--- a/plugins/Mwclist/commonheaders.h
+++ b/plugins/Clist_mw/commonheaders.h
diff --git a/plugins/Mwclist/contact.cpp b/plugins/Clist_mw/contact.cpp
index 54474e3b85..54474e3b85 100644
--- a/plugins/Mwclist/contact.cpp
+++ b/plugins/Clist_mw/contact.cpp
diff --git a/plugins/Mwclist/groupmenu.cpp b/plugins/Clist_mw/groupmenu.cpp
index 496f98e78c..496f98e78c 100644
--- a/plugins/Mwclist/groupmenu.cpp
+++ b/plugins/Clist_mw/groupmenu.cpp
diff --git a/plugins/Mwclist/init.cpp b/plugins/Clist_mw/init.cpp
index 2c155b744d..2c155b744d 100644
--- a/plugins/Mwclist/init.cpp
+++ b/plugins/Clist_mw/init.cpp
diff --git a/plugins/Mwclist/keyboard.cpp b/plugins/Clist_mw/keyboard.cpp
index 361a4f56f5..361a4f56f5 100644
--- a/plugins/Mwclist/keyboard.cpp
+++ b/plugins/Clist_mw/keyboard.cpp
diff --git a/plugins/Mwclist/res/1.ico b/plugins/Clist_mw/res/1.ico
index 76d708cc7d..76d708cc7d 100644
--- a/plugins/Mwclist/res/1.ico
+++ b/plugins/Clist_mw/res/1.ico
diff --git a/plugins/Mwclist/res/2.ico b/plugins/Clist_mw/res/2.ico
index 5b3f38fb88..5b3f38fb88 100644
--- a/plugins/Mwclist/res/2.ico
+++ b/plugins/Clist_mw/res/2.ico
diff --git a/plugins/Mwclist/res/3.ico b/plugins/Clist_mw/res/3.ico
index c79cb1fc50..c79cb1fc50 100644
--- a/plugins/Mwclist/res/3.ico
+++ b/plugins/Clist_mw/res/3.ico
diff --git a/plugins/Mwclist/res/4.ico b/plugins/Clist_mw/res/4.ico
index 7a5f20c680..7a5f20c680 100644
--- a/plugins/Mwclist/res/4.ico
+++ b/plugins/Clist_mw/res/4.ico
diff --git a/plugins/Mwclist/res/5.ico b/plugins/Clist_mw/res/5.ico
index 4d40b3dfd9..4d40b3dfd9 100644
--- a/plugins/Mwclist/res/5.ico
+++ b/plugins/Clist_mw/res/5.ico
diff --git a/plugins/Mwclist/res/6.ico b/plugins/Clist_mw/res/6.ico
index a2dda676b5..a2dda676b5 100644
--- a/plugins/Mwclist/res/6.ico
+++ b/plugins/Clist_mw/res/6.ico
diff --git a/plugins/Mwclist/res/7.ico b/plugins/Clist_mw/res/7.ico
index a33a2dd60c..a33a2dd60c 100644
--- a/plugins/Mwclist/res/7.ico
+++ b/plugins/Clist_mw/res/7.ico
diff --git a/plugins/Mwclist/res/8.ico b/plugins/Clist_mw/res/8.ico
index 15eec5f082..15eec5f082 100644
--- a/plugins/Mwclist/res/8.ico
+++ b/plugins/Clist_mw/res/8.ico
diff --git a/plugins/Mwclist/res/Miranda.ico b/plugins/Clist_mw/res/Miranda.ico
index aa99a2ee3b..aa99a2ee3b 100644
--- a/plugins/Mwclist/res/Miranda.ico
+++ b/plugins/Clist_mw/res/Miranda.ico
diff --git a/plugins/Mwclist/res/addgoupp.ico b/plugins/Clist_mw/res/addgoupp.ico
index 6859bb2103..6859bb2103 100644
--- a/plugins/Mwclist/res/addgoupp.ico
+++ b/plugins/Clist_mw/res/addgoupp.ico
diff --git a/plugins/Mwclist/res/blank.ico b/plugins/Clist_mw/res/blank.ico
index 7845f62fed..7845f62fed 100644
--- a/plugins/Mwclist/res/blank.ico
+++ b/plugins/Clist_mw/res/blank.ico
diff --git a/plugins/Mwclist/res/blank1.ico b/plugins/Clist_mw/res/blank1.ico
index 7845f62fed..7845f62fed 100644
--- a/plugins/Mwclist/res/blank1.ico
+++ b/plugins/Clist_mw/res/blank1.ico
diff --git a/plugins/Mwclist/res/delete.ico b/plugins/Clist_mw/res/delete.ico
index 9108e38cfd..9108e38cfd 100644
--- a/plugins/Mwclist/res/delete.ico
+++ b/plugins/Clist_mw/res/delete.ico
diff --git a/plugins/Mwclist/res/dragcopy.cur b/plugins/Clist_mw/res/dragcopy.cur
index 89c7c960d5..89c7c960d5 100644
--- a/plugins/Mwclist/res/dragcopy.cur
+++ b/plugins/Clist_mw/res/dragcopy.cur
diff --git a/plugins/Mwclist/res/dropuser.cur b/plugins/Clist_mw/res/dropuser.cur
index a84b19e28b..a84b19e28b 100644
--- a/plugins/Mwclist/res/dropuser.cur
+++ b/plugins/Clist_mw/res/dropuser.cur
diff --git a/plugins/Mwclist/res/globus.ico b/plugins/Clist_mw/res/globus.ico
index 6baf15c3c5..6baf15c3c5 100644
--- a/plugins/Mwclist/res/globus.ico
+++ b/plugins/Clist_mw/res/globus.ico
diff --git a/plugins/Mwclist/res/hyperlin.cur b/plugins/Clist_mw/res/hyperlin.cur
index f0f548c828..f0f548c828 100644
--- a/plugins/Mwclist/res/hyperlin.cur
+++ b/plugins/Clist_mw/res/hyperlin.cur
diff --git a/plugins/Mwclist/res/icon1.ico b/plugins/Clist_mw/res/icon1.ico
index 104bb7fd95..104bb7fd95 100644
--- a/plugins/Mwclist/res/icon1.ico
+++ b/plugins/Clist_mw/res/icon1.ico
diff --git a/plugins/Mwclist/res/icon2.ico b/plugins/Clist_mw/res/icon2.ico
index 3f19bd9d47..3f19bd9d47 100644
--- a/plugins/Mwclist/res/icon2.ico
+++ b/plugins/Clist_mw/res/icon2.ico
diff --git a/plugins/Mwclist/res/mirandaclassic.ico b/plugins/Clist_mw/res/mirandaclassic.ico
index 423daa96e1..423daa96e1 100644
--- a/plugins/Mwclist/res/mirandaclassic.ico
+++ b/plugins/Clist_mw/res/mirandaclassic.ico
diff --git a/plugins/Mwclist/res/notick.ico b/plugins/Clist_mw/res/notick.ico
index 7cb0afddd9..7cb0afddd9 100644
--- a/plugins/Mwclist/res/notick.ico
+++ b/plugins/Clist_mw/res/notick.ico
diff --git a/plugins/Mwclist/res/notick1.ico b/plugins/Clist_mw/res/notick1.ico
index 5a2b81aeed..5a2b81aeed 100644
--- a/plugins/Mwclist/res/notick1.ico
+++ b/plugins/Clist_mw/res/notick1.ico
diff --git a/plugins/Mwclist/res/rename.ico b/plugins/Clist_mw/res/rename.ico
index fa8abc8785..fa8abc8785 100644
--- a/plugins/Mwclist/res/rename.ico
+++ b/plugins/Clist_mw/res/rename.ico
diff --git a/plugins/Mwclist/res/sendmail.ico b/plugins/Clist_mw/res/sendmail.ico
index d76b6880f0..d76b6880f0 100644
--- a/plugins/Mwclist/res/sendmail.ico
+++ b/plugins/Clist_mw/res/sendmail.ico
diff --git a/plugins/Mwclist/res/sms.ico b/plugins/Clist_mw/res/sms.ico
index db3b59beab..db3b59beab 100644
--- a/plugins/Mwclist/res/sms.ico
+++ b/plugins/Clist_mw/res/sms.ico
diff --git a/plugins/Mwclist/resource.h b/plugins/Clist_mw/resource.h
index 06c9b4c9df..06c9b4c9df 100644
--- a/plugins/Mwclist/resource.h
+++ b/plugins/Clist_mw/resource.h
diff --git a/plugins/Mwclist/resource.rc b/plugins/Clist_mw/resource.rc
index cb5632154a..cb5632154a 100644
--- a/plugins/Mwclist/resource.rc
+++ b/plugins/Clist_mw/resource.rc