64 files changed, 1 insertions, 264 deletions
diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln
index 6e44d8ce8f..949dd2c0ac 100644
--- a/bin10/mir_full.sln
+++ b/bin10/mir_full.sln
@@ -161,8 +161,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CyrTranslit", "..\plugins\C
 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
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EkHtml", "..\plugins\MirOTR\ekhtml\EkHtml_10.vcxproj", "{2C050CAF-D8AA-468A-B1A7-89F3BE99D3C8}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Libgcrypt", "..\plugins\MirOTR\libgcrypt-1.4.6\libgcrypt146lib_10.vcxproj", "{40FE7861-E54E-4DA9-BE4D-A5178014E477}"
@@ -1054,14 +1052,6 @@ Global
 		{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
 		{2C050CAF-D8AA-468A-B1A7-89F3BE99D3C8}.Debug|Win32.ActiveCfg = Debug|Win32
 		{2C050CAF-D8AA-468A-B1A7-89F3BE99D3C8}.Debug|Win32.Build.0 = Debug|Win32
 		{2C050CAF-D8AA-468A-B1A7-89F3BE99D3C8}.Debug|x64.ActiveCfg = Debug|x64
diff --git a/bin10/mir_full_pro.sln b/bin10/mir_full_pro.sln
index 7747606589..c724b44591 100644
--- a/bin10/mir_full_pro.sln
+++ b/bin10/mir_full_pro.sln
@@ -161,8 +161,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CyrTranslit", "..\plugins\C
 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
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EkHtml", "..\plugins\MirOTR\ekhtml\EkHtml_10.vcxproj", "{2C050CAF-D8AA-468A-B1A7-89F3BE99D3C8}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Libgcrypt", "..\plugins\MirOTR\libgcrypt-1.4.6\libgcrypt146lib_10.vcxproj", "{40FE7861-E54E-4DA9-BE4D-A5178014E477}"
@@ -1086,14 +1084,6 @@ Global
 		{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
 		{2C050CAF-D8AA-468A-B1A7-89F3BE99D3C8}.Debug|Win32.ActiveCfg = Debug|Win32
 		{2C050CAF-D8AA-468A-B1A7-89F3BE99D3C8}.Debug|Win32.Build.0 = Debug|Win32
 		{2C050CAF-D8AA-468A-B1A7-89F3BE99D3C8}.Debug|x64.ActiveCfg = Debug|x64
@@ -1975,7 +1965,6 @@ Global
 		{BE22A21F-73B7-453F-86A0-B867F0056490} = {B913F0DC-E0A2-4973-A65C-BB00A51DB9E4}
 		{987F026D-EB1F-4013-ADA8-2406ACCDA526} = {0D22875F-6B96-49C3-BA4F-D7E573A1515B}
 		{D9057E63-AAAA-4FE7-800A-20C02F4761F3} = {0D22875F-6B96-49C3-BA4F-D7E573A1515B}
-		{56997126-0098-407A-94E1-7C5748C1C9EF} = {0D22875F-6B96-49C3-BA4F-D7E573A1515B}
 		{3C42510C-A29E-4A53-899C-203BFA874E0B} = {0D22875F-6B96-49C3-BA4F-D7E573A1515B}
 		{2E15C462-A150-4A37-ACD6-FBAECF1724F5} = {0D22875F-6B96-49C3-BA4F-D7E573A1515B}
 		{F4F2FD25-1553-FB72-F695-0701D20C3168} = {03FBFF5D-0539-4C51-B7C2-B8CFF9DEA649}
diff --git a/bin12/mir_full.sln b/bin12/mir_full.sln
index ee61a2c6d0..64849be7c7 100644
--- a/bin12/mir_full.sln
+++ b/bin12/mir_full.sln
@@ -163,8 +163,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CyrTranslit", "..\plugins\C
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Clist_modern", "..\plugins\Clist_modern\clist_modern_12.vcxproj", "{D9057E63-AAAA-4FE7-800A-20C02F4761F3}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Clist_mw", "..\plugins\Clist_mw\clist_mw_12.vcxproj", "{56997126-0098-407A-94E1-7C5748C1C9EF}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EkHtml", "..\plugins\MirOTR\ekhtml\EkHtml_12.vcxproj", "{2C050CAF-D8AA-468A-B1A7-89F3BE99D3C8}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Libgcrypt", "..\plugins\MirOTR\libgcrypt-1.4.6\libgcrypt146lib_12.vcxproj", "{40FE7861-E54E-4DA9-BE4D-A5178014E477}"
@@ -1056,14 +1054,6 @@ Global
 		{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
 		{2C050CAF-D8AA-468A-B1A7-89F3BE99D3C8}.Debug|Win32.ActiveCfg = Debug|Win32
 		{2C050CAF-D8AA-468A-B1A7-89F3BE99D3C8}.Debug|Win32.Build.0 = Debug|Win32
 		{2C050CAF-D8AA-468A-B1A7-89F3BE99D3C8}.Debug|x64.ActiveCfg = Debug|x64
diff --git a/langpacks/english/Plugins/Clist_mw.txt b/langpacks/english/Plugins/Clist_mw.txt
deleted file mode 100644
index 15e3cf427d..0000000000
--- a/langpacks/english/Plugins/Clist_mw.txt
+++ /dev/null
@@ -1,233 +0,0 @@
-#muuid {2a417ab9-16f2-472d-9ae3-415103c78a64}
-;============================================================
-;  File: Clist_mw.dll
-;  Plugin: MultiWindow contact list
-;  Version: 0.9.0.0
-;  Authors: Bethoven
-;============================================================
-[Displays contacts, event notifications, protocol status with MW modifications.]
-;file \plugins\Clist_mw\res\resource.rc
-[Settings]
-[Background color:]
-[Selection color:]
-[Use background bitmap]
-[Stretch to width]
-[Stretch to height]
-[Tile horizontally]
-[Tile vertically]
-[Scroll with text]
-[Stretch proportionally]
-[Tile vertically according to Row Height]
-[Warning!\r\nThis MenuObject not support user defined options.]
-[MenuObjects]
-[MenuItems]
-[InsertSeparator]
-[Service:]
-[Name:]
-[Set]
-[Default]
-[Delete Contact]
-[No]
-[Yes]
-[Hide from list only, in order to keep their history and ignore/visibility settings]
-[Use Options->Contacts->Ignore to unhide contacts.]
-[Are you sure you want to delete %s?]
-[This will erase all history and settings for this contact!]
-[Hide offline users]
-[Hide empty groups]
-[Disable groups]
-[Ask before deleting contacts]
-[Always on top]
-[Hide contact list after it has been idle for]
-[seconds]
-[Sort contacts by name]
-[Sort contacts by status]
-[Sort contacts by protocol]
-[Single click interface]
-[Always show status in tooltip]
-[Disable icon blinking]
-[ms, delay between icon blinking]
-[Show]
-[icon when statuses differ]
-[Cycle icons every]
-[seconds, when statuses differ]
-[Show multiple icons]
-[Only when statuses differ]
-[Contact list]
-[System tray icon]
-[System tray icon when using multiple protocols]
-[Contact list sorting]
-[Don't move offline user to bottom]
-[Pin to desktop]
-[Rows]
-[Row height:]
-[pixels]
-[Gamma correction]
-[Window]
-[Tool style main window]
-[Minimize to tray]
-[Automatically resize window to height of list]
-[maximum]
-[% of screen]
-[Size upwards]
-[Title bar text:]
-[Translucency options]
-[Fade contact list in/out]
-[Transparent contact list]
-[Inactive opacity:]
-[Active opacity:]
-[Show menu bar]
-[Easy move]
-[Show title bar]
-[If window is partially covered, bring to front instead of hiding]
-[Enable drop shadow (restart required)]
-[Items]
-[Show divider between online and offline contacts]
-[Hot track items as mouse passes over]
-[Disable drag and drop of items]
-[Disable rename of items by clicking twice]
-[Show selection even when list is not focused]
-[Make selection highlight translucent]
-['Hide offline' means to hide:]
-[Groups]
-[Draw a line alongside group names]
-[Show counts of number of contacts in a group]
-[Hide group counts when there are none online]
-[Sort groups alphabetically]
-[Quicksearch in open groups only]
-[Indent groups by:]
-[Visual]
-[Scroll list smoothly]
-[Time:]
-[milliseconds]
-[Left margin:]
-[Gray out entire list when:]
-[Dim idle contacts]
-[Hide vertical scrollbar]
-[Contact list background]
-[Use 'Meta' protocol icons for metacontacts]
-[Avoid double click expand]
-[Hide all extra icons for subcontacts]
-[Metacontacts supporting]
-[Ignore empty extra icons places (arrange to right)]
-[Hide offline subcontacts]
-[Status bar]
-[Show status bar]
-[Show icons]
-[Show protocol names]
-[Show status text]
-[Right click opens status menu]
-[Right click opens Miranda menu]
-[Make sections equal width]
-[Show size grip]
-[Show bevel effect on panels]
-[Use connecting icon]
-[Use new drawer for status bar]
-[&Main menu]
-[E&xit]
-[&Status]
-[&Offline\tCtrl+0]
-[On&line\tCtrl+1]
-[&Away\tCtrl+2]
-[&NA\tCtrl+3]
-[Occ&upied\tCtrl+4]
-[&DND\tCtrl+5]
-[&Free for chat\tCtrl+6]
-[&Invisible\tCtrl+7]
-[On the &phone\tCtrl+8]
-[Out to &lunch\tCtrl+9]
-[Tray]
-[&Hide/Show]
-[Nowhere]
-[&New group]
-[&Hide offline users]
-[Hide &offline users out here]
-[Hide &empty groups]
-[Disable &groups]
-[Hide Miranda]
-[Group]
-[&New subgroup]
-[&Hide offline users in here]
-[&Rename group]
-[&Delete group]
-;file \plugins\Clist_mw\src\BkgrCfg.cpp
-[Customize]
-[Backgrounds]
-;file \plugins\Clist_mw\src\clc.cpp
-[Status bar background]
-[List background]
-[Frames title bar background]
-;file \plugins\Clist_mw\src\clcfonts.cpp
-[Standard contacts]
-[Online contacts to whom you have a different visibility]
-[Offline contacts]
-[Contacts which are 'not on list']
-[Group member counts]
-[Dividers]
-[Offline contacts to whom you have a different visibility]
-[Status messages]
-[Group closed]
-[Hovered contacts]
-[Background]
-[Selected text]
-[Hottrack text]
-[Quicksearch text]
-;file \plugins\Clist_mw\src\clcopts.cpp
-[List]
-[List metacontacts]
-[Not focused]
-[Offline]
-[Online]
-[Away]
-[NA]
-[Occupied]
-[DND]
-[Free for chat]
-[Invisible]
-[Out to lunch]
-[On the phone]
-;file \plugins\Clist_mw\src\clistopts.cpp
-[Global]
-;file \plugins\Clist_mw\src\clistsettings.cpp
-[_NoProtocol_]
-[(Unknown Contact)]
-;file \plugins\Clist_mw\src\clisttray.cpp
-[Tray menu]
-[&Find/Add contacts...]
-[&Options...]
-[&About]
-;file \plugins\Clist_mw\src\clui.cpp
-[My contacts]
-[My Contacts]
-;file \plugins\Clist_mw\src\cluiopts.cpp
-;file \plugins\Clist_mw\src\groupmenu.cpp
-[Group menu]
-[Subgroup menu]
-;file \plugins\Clist_mw\src\keyboard.cpp
-[Close Miranda]
-[Restore last status]
-;file \plugins\Clist_mw\src\CLUIFrames\cluiframes.cpp
-[&FrameTitle]
-[&Visible]
-[&Show title bar]
-[&Locked]
-[&Collapsed]
-[&Floating mode]
-[&Border]
-[&Align]
-[&Top]
-[&Client]
-[&Bottom]
-[&Position]
-[&Up]
-[&Down]
-[Frames]
-[Show all frames]
-[Show all title bars]
-[Hide all title bars]
-[Lock frame]
-[Visible]
-[Floating]
-;file \plugins\Clist_mw\src\CLUIFrames\framesmenu.cpp
-[Frame menu]
-;file \plugins\Clist_mw\src\CLUIFrames\statusbar.cpp
diff --git a/langpacks/russian/Plugins/Clist_mw.txt b/langpacks/russian/Deprecated/Clist_mw.txt
index f653a53eeb..f653a53eeb 100644
--- a/langpacks/russian/Plugins/Clist_mw.txt
+++ b/langpacks/russian/Deprecated/Clist_mw.txt
diff --git a/plugins/Clist_mw/clist_mw_10.vcxproj b/plugins/!Deprecated/Clist_mw/clist_mw_10.vcxproj
index a5df001f7f..a5df001f7f 100644
--- a/plugins/Clist_mw/clist_mw_10.vcxproj
+++ b/plugins/!Deprecated/Clist_mw/clist_mw_10.vcxproj
diff --git a/plugins/Clist_mw/clist_mw_10.vcxproj.filters b/plugins/!Deprecated/Clist_mw/clist_mw_10.vcxproj.filters
index c117a63633..c117a63633 100644
--- a/plugins/Clist_mw/clist_mw_10.vcxproj.filters
+++ b/plugins/!Deprecated/Clist_mw/clist_mw_10.vcxproj.filters
diff --git a/plugins/Clist_mw/clist_mw_12.vcxproj b/plugins/!Deprecated/Clist_mw/clist_mw_12.vcxproj
index 45ddd741c8..45ddd741c8 100644
--- a/plugins/Clist_mw/clist_mw_12.vcxproj
+++ b/plugins/!Deprecated/Clist_mw/clist_mw_12.vcxproj
diff --git a/plugins/Clist_mw/clist_mw_12.vcxproj.filters b/plugins/!Deprecated/Clist_mw/clist_mw_12.vcxproj.filters
index c117a63633..c117a63633 100644
--- a/plugins/Clist_mw/clist_mw_12.vcxproj.filters
+++ b/plugins/!Deprecated/Clist_mw/clist_mw_12.vcxproj.filters
diff --git a/plugins/Clist_mw/res/1.ico b/plugins/!Deprecated/Clist_mw/res/1.ico
index df6c8fc04e..df6c8fc04e 100644
--- a/plugins/Clist_mw/res/1.ico
+++ b/plugins/!Deprecated/Clist_mw/res/1.ico
diff --git a/plugins/Clist_mw/res/2.ico b/plugins/!Deprecated/Clist_mw/res/2.ico
index ce05d2b327..ce05d2b327 100644
--- a/plugins/Clist_mw/res/2.ico
+++ b/plugins/!Deprecated/Clist_mw/res/2.ico
diff --git a/plugins/Clist_mw/res/3.ico b/plugins/!Deprecated/Clist_mw/res/3.ico
index 4bdb2b9e8a..4bdb2b9e8a 100644
--- a/plugins/Clist_mw/res/3.ico
+++ b/plugins/!Deprecated/Clist_mw/res/3.ico
diff --git a/plugins/Clist_mw/res/4.ico b/plugins/!Deprecated/Clist_mw/res/4.ico
index 712f0b3905..712f0b3905 100644
--- a/plugins/Clist_mw/res/4.ico
+++ b/plugins/!Deprecated/Clist_mw/res/4.ico
diff --git a/plugins/Clist_mw/res/5.ico b/plugins/!Deprecated/Clist_mw/res/5.ico
index 4ab50eafd3..4ab50eafd3 100644
--- a/plugins/Clist_mw/res/5.ico
+++ b/plugins/!Deprecated/Clist_mw/res/5.ico
diff --git a/plugins/Clist_mw/res/6.ico b/plugins/!Deprecated/Clist_mw/res/6.ico
index 35629e8cd2..35629e8cd2 100644
--- a/plugins/Clist_mw/res/6.ico
+++ b/plugins/!Deprecated/Clist_mw/res/6.ico
diff --git a/plugins/Clist_mw/res/7.ico b/plugins/!Deprecated/Clist_mw/res/7.ico
index cdb11c58bd..cdb11c58bd 100644
--- a/plugins/Clist_mw/res/7.ico
+++ b/plugins/!Deprecated/Clist_mw/res/7.ico
diff --git a/plugins/Clist_mw/res/8.ico b/plugins/!Deprecated/Clist_mw/res/8.ico
index 4489d84723..4489d84723 100644
--- a/plugins/Clist_mw/res/8.ico
+++ b/plugins/!Deprecated/Clist_mw/res/8.ico
diff --git a/plugins/Clist_mw/res/Miranda.ico b/plugins/!Deprecated/Clist_mw/res/Miranda.ico
index db8dc77c09..db8dc77c09 100644
--- a/plugins/Clist_mw/res/Miranda.ico
+++ b/plugins/!Deprecated/Clist_mw/res/Miranda.ico
diff --git a/plugins/Clist_mw/res/Version.rc b/plugins/!Deprecated/Clist_mw/res/Version.rc
index 5bfbab4754..5bfbab4754 100644
--- a/plugins/Clist_mw/res/Version.rc
+++ b/plugins/!Deprecated/Clist_mw/res/Version.rc
diff --git a/plugins/Clist_mw/res/addgoupp.ico b/plugins/!Deprecated/Clist_mw/res/addgoupp.ico
index 539c32fcd9..539c32fcd9 100644
--- a/plugins/Clist_mw/res/addgoupp.ico
+++ b/plugins/!Deprecated/Clist_mw/res/addgoupp.ico
diff --git a/plugins/Clist_mw/res/delete.ico b/plugins/!Deprecated/Clist_mw/res/delete.ico
index 3770daf2fc..3770daf2fc 100644
--- a/plugins/Clist_mw/res/delete.ico
+++ b/plugins/!Deprecated/Clist_mw/res/delete.ico
diff --git a/plugins/Clist_mw/res/globus.ico b/plugins/!Deprecated/Clist_mw/res/globus.ico
index dbf58aeb04..dbf58aeb04 100644
--- a/plugins/Clist_mw/res/globus.ico
+++ b/plugins/!Deprecated/Clist_mw/res/globus.ico
diff --git a/plugins/Clist_mw/res/icon1.ico b/plugins/!Deprecated/Clist_mw/res/icon1.ico
index cad0e2a5cc..cad0e2a5cc 100644
--- a/plugins/Clist_mw/res/icon1.ico
+++ b/plugins/!Deprecated/Clist_mw/res/icon1.ico
diff --git a/plugins/Clist_mw/res/icon2.ico b/plugins/!Deprecated/Clist_mw/res/icon2.ico
index 8ee933d416..8ee933d416 100644
--- a/plugins/Clist_mw/res/icon2.ico
+++ b/plugins/!Deprecated/Clist_mw/res/icon2.ico
diff --git a/plugins/Clist_mw/res/mirandaclassic.ico b/plugins/!Deprecated/Clist_mw/res/mirandaclassic.ico
index 0c8d999e70..0c8d999e70 100644
--- a/plugins/Clist_mw/res/mirandaclassic.ico
+++ b/plugins/!Deprecated/Clist_mw/res/mirandaclassic.ico
diff --git a/plugins/Clist_mw/res/notick.ico b/plugins/!Deprecated/Clist_mw/res/notick.ico
index 2a78c302df..2a78c302df 100644
--- a/plugins/Clist_mw/res/notick.ico
+++ b/plugins/!Deprecated/Clist_mw/res/notick.ico
diff --git a/plugins/Clist_mw/res/notick1.ico b/plugins/!Deprecated/Clist_mw/res/notick1.ico
index 0ba1d546f3..0ba1d546f3 100644
--- a/plugins/Clist_mw/res/notick1.ico
+++ b/plugins/!Deprecated/Clist_mw/res/notick1.ico
diff --git a/plugins/Clist_mw/res/rename.ico b/plugins/!Deprecated/Clist_mw/res/rename.ico
index 90848f1179..90848f1179 100644
--- a/plugins/Clist_mw/res/rename.ico
+++ b/plugins/!Deprecated/Clist_mw/res/rename.ico
diff --git a/plugins/Clist_mw/res/resource.rc b/plugins/!Deprecated/Clist_mw/res/resource.rc
index f3337f2f52..f3337f2f52 100644
--- a/plugins/Clist_mw/res/resource.rc
+++ b/plugins/!Deprecated/Clist_mw/res/resource.rc
diff --git a/plugins/Clist_mw/res/sendmail.ico b/plugins/!Deprecated/Clist_mw/res/sendmail.ico
index 461ecc9557..461ecc9557 100644
--- a/plugins/Clist_mw/res/sendmail.ico
+++ b/plugins/!Deprecated/Clist_mw/res/sendmail.ico
diff --git a/plugins/Clist_mw/res/sms.ico b/plugins/!Deprecated/Clist_mw/res/sms.ico
index 6d6ff2162b..6d6ff2162b 100644
--- a/plugins/Clist_mw/res/sms.ico
+++ b/plugins/!Deprecated/Clist_mw/res/sms.ico
diff --git a/plugins/Clist_mw/src/BkgrCfg.cpp b/plugins/!Deprecated/Clist_mw/src/BkgrCfg.cpp
index 8895bacbaa..8895bacbaa 100644
--- a/plugins/Clist_mw/src/BkgrCfg.cpp
+++ b/plugins/!Deprecated/Clist_mw/src/BkgrCfg.cpp
diff --git a/plugins/Clist_mw/src/BkgrCfg.h b/plugins/!Deprecated/Clist_mw/src/BkgrCfg.h
index a47b53a603..a47b53a603 100644
--- a/plugins/Clist_mw/src/BkgrCfg.h
+++ b/plugins/!Deprecated/Clist_mw/src/BkgrCfg.h
diff --git a/plugins/Clist_mw/src/CLUIFrames/cluiframes.cpp b/plugins/!Deprecated/Clist_mw/src/CLUIFrames/cluiframes.cpp
index 129bd2e794..129bd2e794 100644
--- a/plugins/Clist_mw/src/CLUIFrames/cluiframes.cpp
+++ b/plugins/!Deprecated/Clist_mw/src/CLUIFrames/cluiframes.cpp
diff --git a/plugins/Clist_mw/src/CLUIFrames/cluiframes.h b/plugins/!Deprecated/Clist_mw/src/CLUIFrames/cluiframes.h
index b38975ea8f..b38975ea8f 100644
--- a/plugins/Clist_mw/src/CLUIFrames/cluiframes.h
+++ b/plugins/!Deprecated/Clist_mw/src/CLUIFrames/cluiframes.h
diff --git a/plugins/Clist_mw/src/CLUIFrames/framesmenu.cpp b/plugins/!Deprecated/Clist_mw/src/CLUIFrames/framesmenu.cpp
index d414bdc2f2..d414bdc2f2 100644
--- a/plugins/Clist_mw/src/CLUIFrames/framesmenu.cpp
+++ b/plugins/!Deprecated/Clist_mw/src/CLUIFrames/framesmenu.cpp
diff --git a/plugins/Clist_mw/src/CLUIFrames/statusbar.cpp b/plugins/!Deprecated/Clist_mw/src/CLUIFrames/statusbar.cpp
index 9df66c7368..9df66c7368 100644
--- a/plugins/Clist_mw/src/CLUIFrames/statusbar.cpp
+++ b/plugins/!Deprecated/Clist_mw/src/CLUIFrames/statusbar.cpp
diff --git a/plugins/Clist_mw/src/Version.h b/plugins/!Deprecated/Clist_mw/src/Version.h
index 961c80eef1..961c80eef1 100644
--- a/plugins/Clist_mw/src/Version.h
+++ b/plugins/!Deprecated/Clist_mw/src/Version.h
diff --git a/plugins/Clist_mw/src/clc.cpp b/plugins/!Deprecated/Clist_mw/src/clc.cpp
index a3c382c1cc..a3c382c1cc 100644
--- a/plugins/Clist_mw/src/clc.cpp
+++ b/plugins/!Deprecated/Clist_mw/src/clc.cpp
diff --git a/plugins/Clist_mw/src/clc.h b/plugins/!Deprecated/Clist_mw/src/clc.h
index efc13fd87d..efc13fd87d 100644
--- a/plugins/Clist_mw/src/clc.h
+++ b/plugins/!Deprecated/Clist_mw/src/clc.h
diff --git a/plugins/Clist_mw/src/clcfonts.cpp b/plugins/!Deprecated/Clist_mw/src/clcfonts.cpp
index de73ee3600..de73ee3600 100644
--- a/plugins/Clist_mw/src/clcfonts.cpp
+++ b/plugins/!Deprecated/Clist_mw/src/clcfonts.cpp
diff --git a/plugins/Clist_mw/src/clcidents.cpp b/plugins/!Deprecated/Clist_mw/src/clcidents.cpp
index c74a2d8bfb..c74a2d8bfb 100644
--- a/plugins/Clist_mw/src/clcidents.cpp
+++ b/plugins/!Deprecated/Clist_mw/src/clcidents.cpp
diff --git a/plugins/Clist_mw/src/clcitems.cpp b/plugins/!Deprecated/Clist_mw/src/clcitems.cpp
index 0e67a18318..0e67a18318 100644
--- a/plugins/Clist_mw/src/clcitems.cpp
+++ b/plugins/!Deprecated/Clist_mw/src/clcitems.cpp
diff --git a/plugins/Clist_mw/src/clcopts.cpp b/plugins/!Deprecated/Clist_mw/src/clcopts.cpp
index 2ce7736a7a..2ce7736a7a 100644
--- a/plugins/Clist_mw/src/clcopts.cpp
+++ b/plugins/!Deprecated/Clist_mw/src/clcopts.cpp
diff --git a/plugins/Clist_mw/src/clcpaint.cpp b/plugins/!Deprecated/Clist_mw/src/clcpaint.cpp
index fef2359bd5..fef2359bd5 100644
--- a/plugins/Clist_mw/src/clcpaint.cpp
+++ b/plugins/!Deprecated/Clist_mw/src/clcpaint.cpp
diff --git a/plugins/Clist_mw/src/clcutils.cpp b/plugins/!Deprecated/Clist_mw/src/clcutils.cpp
index 0edfda16ed..0edfda16ed 100644
--- a/plugins/Clist_mw/src/clcutils.cpp
+++ b/plugins/!Deprecated/Clist_mw/src/clcutils.cpp
diff --git a/plugins/Clist_mw/src/clist.h b/plugins/!Deprecated/Clist_mw/src/clist.h
index dad33fa285..dad33fa285 100644
--- a/plugins/Clist_mw/src/clist.h
+++ b/plugins/!Deprecated/Clist_mw/src/clist.h
diff --git a/plugins/Clist_mw/src/clistmenus.cpp b/plugins/!Deprecated/Clist_mw/src/clistmenus.cpp
index 8a9f96d06f..8a9f96d06f 100644
--- a/plugins/Clist_mw/src/clistmenus.cpp
+++ b/plugins/!Deprecated/Clist_mw/src/clistmenus.cpp
diff --git a/plugins/Clist_mw/src/clistmod.cpp b/plugins/!Deprecated/Clist_mw/src/clistmod.cpp
index 869fcfc56c..869fcfc56c 100644
--- a/plugins/Clist_mw/src/clistmod.cpp
+++ b/plugins/!Deprecated/Clist_mw/src/clistmod.cpp
diff --git a/plugins/Clist_mw/src/clistopts.cpp b/plugins/!Deprecated/Clist_mw/src/clistopts.cpp
index 490e184230..490e184230 100644
--- a/plugins/Clist_mw/src/clistopts.cpp
+++ b/plugins/!Deprecated/Clist_mw/src/clistopts.cpp
diff --git a/plugins/Clist_mw/src/clistsettings.cpp b/plugins/!Deprecated/Clist_mw/src/clistsettings.cpp
index 01b42ebf6f..01b42ebf6f 100644
--- a/plugins/Clist_mw/src/clistsettings.cpp
+++ b/plugins/!Deprecated/Clist_mw/src/clistsettings.cpp
diff --git a/plugins/Clist_mw/src/clisttray.cpp b/plugins/!Deprecated/Clist_mw/src/clisttray.cpp
index aa89abe500..aa89abe500 100644
--- a/plugins/Clist_mw/src/clisttray.cpp
+++ b/plugins/!Deprecated/Clist_mw/src/clisttray.cpp
diff --git a/plugins/Clist_mw/src/clui.cpp b/plugins/!Deprecated/Clist_mw/src/clui.cpp
index 69ea15f8e1..69ea15f8e1 100644
--- a/plugins/Clist_mw/src/clui.cpp
+++ b/plugins/!Deprecated/Clist_mw/src/clui.cpp
diff --git a/plugins/Clist_mw/src/cluiopts.cpp b/plugins/!Deprecated/Clist_mw/src/cluiopts.cpp
index 1287c5cab5..1287c5cab5 100644
--- a/plugins/Clist_mw/src/cluiopts.cpp
+++ b/plugins/!Deprecated/Clist_mw/src/cluiopts.cpp
diff --git a/plugins/Clist_mw/src/cluiservices.cpp b/plugins/!Deprecated/Clist_mw/src/cluiservices.cpp
index 4fc0066b1e..4fc0066b1e 100644
--- a/plugins/Clist_mw/src/cluiservices.cpp
+++ b/plugins/!Deprecated/Clist_mw/src/cluiservices.cpp
diff --git a/plugins/Clist_mw/src/commonheaders.cpp b/plugins/!Deprecated/Clist_mw/src/commonheaders.cpp
index c76992e096..c76992e096 100644
--- a/plugins/Clist_mw/src/commonheaders.cpp
+++ b/plugins/!Deprecated/Clist_mw/src/commonheaders.cpp
diff --git a/plugins/Clist_mw/src/commonheaders.h b/plugins/!Deprecated/Clist_mw/src/commonheaders.h
index ed78d84707..ed78d84707 100644
--- a/plugins/Clist_mw/src/commonheaders.h
+++ b/plugins/!Deprecated/Clist_mw/src/commonheaders.h
diff --git a/plugins/Clist_mw/src/contact.cpp b/plugins/!Deprecated/Clist_mw/src/contact.cpp
index 4f2fe4b3d7..4f2fe4b3d7 100644
--- a/plugins/Clist_mw/src/contact.cpp
+++ b/plugins/!Deprecated/Clist_mw/src/contact.cpp
diff --git a/plugins/Clist_mw/src/groupmenu.cpp b/plugins/!Deprecated/Clist_mw/src/groupmenu.cpp
index 70932d494c..70932d494c 100644
--- a/plugins/Clist_mw/src/groupmenu.cpp
+++ b/plugins/!Deprecated/Clist_mw/src/groupmenu.cpp
diff --git a/plugins/Clist_mw/src/init.cpp b/plugins/!Deprecated/Clist_mw/src/init.cpp
index dd509257b9..dd509257b9 100644
--- a/plugins/Clist_mw/src/init.cpp
+++ b/plugins/!Deprecated/Clist_mw/src/init.cpp
diff --git a/plugins/Clist_mw/src/keyboard.cpp b/plugins/!Deprecated/Clist_mw/src/keyboard.cpp
index bd8a438231..bd8a438231 100644
--- a/plugins/Clist_mw/src/keyboard.cpp
+++ b/plugins/!Deprecated/Clist_mw/src/keyboard.cpp
diff --git a/plugins/Clist_mw/src/resource.h b/plugins/!Deprecated/Clist_mw/src/resource.h
index a726d14957..a726d14957 100644
--- a/plugins/Clist_mw/src/resource.h
+++ b/plugins/!Deprecated/Clist_mw/src/resource.h
diff --git a/plugins/Clist_mw/src/stdafx.cpp b/plugins/!Deprecated/Clist_mw/src/stdafx.cpp
index 0edf9e36e6..0edf9e36e6 100644
--- a/plugins/Clist_mw/src/stdafx.cpp
+++ b/plugins/!Deprecated/Clist_mw/src/stdafx.cpp
diff --git a/plugins/PluginUpdater/src/DlgUpdate.cpp b/plugins/PluginUpdater/src/DlgUpdate.cpp
index 258efd4389..56de9eef47 100644
--- a/plugins/PluginUpdater/src/DlgUpdate.cpp
+++ b/plugins/PluginUpdater/src/DlgUpdate.cpp
@@ -510,6 +510,7 @@ static renameTable[] =
 	{ _T("newnr.dll"),                      _T("Plugins\\notesreminders.dll") },
 	{ _T("dbtool.exe"),                     _T("Plugins\\dbchecker.dll") },
 	{ _T("dbtool_sa.exe"),                  _T("Plugins\\dbchecker.dll") },
+	{ _T("clist_mw.dll"),                   _T("Plugins\\clist_nicer.dll") },
 	{ _T("bclist.dll"),                     _T("Plugins\\clist_blind.dll") },
 	{ _T("otr.dll"),                        _T("Plugins\\mirotr.dll") },
 	{ _T("ttnotify.dll"),                   _T("Plugins\\tooltipnotify.dll") },