2 files changed, 35 insertions, 178 deletions
diff --git a/bin10/mir_icons.sln b/bin10/mir_icons.sln
index 0a5ffd3c8c..39af0fc789 100644
--- a/bin10/mir_icons.sln
+++ b/bin10/mir_icons.sln
@@ -64,39 +64,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Weather", "..\plugins
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_YAMN", "..\plugins\YAMN\proto_yamn\proto_YAMN_10.vcxproj", "{C1CDB82C-6BBF-496E-88F4-CC57E60B0CA9}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClientIcons_AIM", "..\plugins\FingerprintNG\iconpacks\ClientIcons_AIM.vcxproj", "{2D1D3D7C-F86B-4189-8D57-96575D441182}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClientIcons_GG", "..\plugins\FingerprintNG\iconpacks\ClientIcons_GG.vcxproj", "{48DDA047-898E-4C4C-A567-C76FE007BBB3}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClientIcons_ICQ", "..\plugins\FingerprintNG\iconpacks\ClientIcons_ICQ.vcxproj", "{14CB2AEA-EFE8-464E-9446-C08DF9619EBC}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClientIcons_IRC", "..\plugins\FingerprintNG\iconpacks\ClientIcons_IRC.vcxproj", "{3BEFA882-9323-4CFF-83D2-368B7D7C2488}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClientIcons_Jabber", "..\plugins\FingerprintNG\iconpacks\ClientIcons_Jabber.vcxproj", "{23CF8697-38C5-4CEB-87BD-544EF8589619}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClientIcons_Miranda", "..\plugins\FingerprintNG\iconpacks\ClientIcons_Miranda.vcxproj", "{7F854B13-37EA-4956-BAEE-9715AE9F4579}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClientIcons_MRA", "..\plugins\FingerprintNG\iconpacks\ClientIcons_MRA.vcxproj", "{8DE3A1E9-BCD9-429D-A81D-35B6F86AA0AA}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClientIcons_MSN", "..\plugins\FingerprintNG\iconpacks\ClientIcons_MSN.vcxproj", "{DA88431F-AAD2-4A15-BBA0-8435A3DE8BE7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClientIcons_Multiproto", "..\plugins\FingerprintNG\iconpacks\ClientIcons_Multiproto.vcxproj", "{196C0237-7C8A-4887-BD0F-52E6BBE1D61B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClientIcons_Others", "..\plugins\FingerprintNG\iconpacks\ClientIcons_Others.vcxproj", "{1957D0AE-B386-4BF0-A8B9-42229922BA91}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClientIcons_Overlays", "..\plugins\FingerprintNG\iconpacks\ClientIcons_Overlays.vcxproj", "{7D81F099-33CC-4FF3-A465-3943CB3F70C6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClientIcons_Packs", "..\plugins\FingerprintNG\iconpacks\ClientIcons_Packs.vcxproj", "{99331043-10E4-4171-940E-D43E51B0401B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClientIcons_QQ", "..\plugins\FingerprintNG\iconpacks\ClientIcons_QQ.vcxproj", "{DD92D185-5AE5-4E39-90C0-D9804E85768F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClientIcons_RSS", "..\plugins\FingerprintNG\iconpacks\ClientIcons_RSS.vcxproj", "{EE41CC3A-FBC3-434E-B8E9-810D0287BC0D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClientIcons_Tlen", "..\plugins\FingerprintNG\iconpacks\ClientIcons_Tlen.vcxproj", "{FC2C1A39-F5E3-4791-B425-E74E5F296C4B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClientIcons_Weather", "..\plugins\FingerprintNG\iconpacks\ClientIcons_Weather.vcxproj", "{D88692A8-F0A3-4B13-A35B-89D2DDA6A3FB}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClientIcons_Yahoo", "..\plugins\FingerprintNG\iconpacks\ClientIcons_Yahoo.vcxproj", "{CF3A5226-1264-4735-83AE-A65C349FC61E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Fp_icons", "..\plugins\FingerprintNG\iconpacks\fp_icons.vcxproj", "{7F854B13-37EA-4956-BAEE-9715AE9F4579}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -362,46 +330,6 @@ Global
 		{C1CDB82C-6BBF-496E-88F4-CC57E60B0CA9}.Release|Win32.Build.0 = Release|Win32
 		{C1CDB82C-6BBF-496E-88F4-CC57E60B0CA9}.Release|x64.ActiveCfg = Release|x64
 		{C1CDB82C-6BBF-496E-88F4-CC57E60B0CA9}.Release|x64.Build.0 = Release|x64
-		{2D1D3D7C-F86B-4189-8D57-96575D441182}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2D1D3D7C-F86B-4189-8D57-96575D441182}.Debug|Win32.Build.0 = Debug|Win32
-		{2D1D3D7C-F86B-4189-8D57-96575D441182}.Debug|x64.ActiveCfg = Debug|x64
-		{2D1D3D7C-F86B-4189-8D57-96575D441182}.Debug|x64.Build.0 = Debug|x64
-		{2D1D3D7C-F86B-4189-8D57-96575D441182}.Release|Win32.ActiveCfg = Release|Win32
-		{2D1D3D7C-F86B-4189-8D57-96575D441182}.Release|Win32.Build.0 = Release|Win32
-		{2D1D3D7C-F86B-4189-8D57-96575D441182}.Release|x64.ActiveCfg = Release|x64
-		{2D1D3D7C-F86B-4189-8D57-96575D441182}.Release|x64.Build.0 = Release|x64
-		{48DDA047-898E-4C4C-A567-C76FE007BBB3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{48DDA047-898E-4C4C-A567-C76FE007BBB3}.Debug|Win32.Build.0 = Debug|Win32
-		{48DDA047-898E-4C4C-A567-C76FE007BBB3}.Debug|x64.ActiveCfg = Debug|x64
-		{48DDA047-898E-4C4C-A567-C76FE007BBB3}.Debug|x64.Build.0 = Debug|x64
-		{48DDA047-898E-4C4C-A567-C76FE007BBB3}.Release|Win32.ActiveCfg = Release|Win32
-		{48DDA047-898E-4C4C-A567-C76FE007BBB3}.Release|Win32.Build.0 = Release|Win32
-		{48DDA047-898E-4C4C-A567-C76FE007BBB3}.Release|x64.ActiveCfg = Release|x64
-		{48DDA047-898E-4C4C-A567-C76FE007BBB3}.Release|x64.Build.0 = Release|x64
-		{14CB2AEA-EFE8-464E-9446-C08DF9619EBC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{14CB2AEA-EFE8-464E-9446-C08DF9619EBC}.Debug|Win32.Build.0 = Debug|Win32
-		{14CB2AEA-EFE8-464E-9446-C08DF9619EBC}.Debug|x64.ActiveCfg = Debug|x64
-		{14CB2AEA-EFE8-464E-9446-C08DF9619EBC}.Debug|x64.Build.0 = Debug|x64
-		{14CB2AEA-EFE8-464E-9446-C08DF9619EBC}.Release|Win32.ActiveCfg = Release|Win32
-		{14CB2AEA-EFE8-464E-9446-C08DF9619EBC}.Release|Win32.Build.0 = Release|Win32
-		{14CB2AEA-EFE8-464E-9446-C08DF9619EBC}.Release|x64.ActiveCfg = Release|x64
-		{14CB2AEA-EFE8-464E-9446-C08DF9619EBC}.Release|x64.Build.0 = Release|x64
-		{3BEFA882-9323-4CFF-83D2-368B7D7C2488}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3BEFA882-9323-4CFF-83D2-368B7D7C2488}.Debug|Win32.Build.0 = Debug|Win32
-		{3BEFA882-9323-4CFF-83D2-368B7D7C2488}.Debug|x64.ActiveCfg = Debug|x64
-		{3BEFA882-9323-4CFF-83D2-368B7D7C2488}.Debug|x64.Build.0 = Debug|x64
-		{3BEFA882-9323-4CFF-83D2-368B7D7C2488}.Release|Win32.ActiveCfg = Release|Win32
-		{3BEFA882-9323-4CFF-83D2-368B7D7C2488}.Release|Win32.Build.0 = Release|Win32
-		{3BEFA882-9323-4CFF-83D2-368B7D7C2488}.Release|x64.ActiveCfg = Release|x64
-		{3BEFA882-9323-4CFF-83D2-368B7D7C2488}.Release|x64.Build.0 = Release|x64
-		{23CF8697-38C5-4CEB-87BD-544EF8589619}.Debug|Win32.ActiveCfg = Debug|Win32
-		{23CF8697-38C5-4CEB-87BD-544EF8589619}.Debug|Win32.Build.0 = Debug|Win32
-		{23CF8697-38C5-4CEB-87BD-544EF8589619}.Debug|x64.ActiveCfg = Debug|x64
-		{23CF8697-38C5-4CEB-87BD-544EF8589619}.Debug|x64.Build.0 = Debug|x64
-		{23CF8697-38C5-4CEB-87BD-544EF8589619}.Release|Win32.ActiveCfg = Release|Win32
-		{23CF8697-38C5-4CEB-87BD-544EF8589619}.Release|Win32.Build.0 = Release|Win32
-		{23CF8697-38C5-4CEB-87BD-544EF8589619}.Release|x64.ActiveCfg = Release|x64
-		{23CF8697-38C5-4CEB-87BD-544EF8589619}.Release|x64.Build.0 = Release|x64
 		{7F854B13-37EA-4956-BAEE-9715AE9F4579}.Debug|Win32.ActiveCfg = Debug|Win32
 		{7F854B13-37EA-4956-BAEE-9715AE9F4579}.Debug|Win32.Build.0 = Debug|Win32
 		{7F854B13-37EA-4956-BAEE-9715AE9F4579}.Debug|x64.ActiveCfg = Debug|x64
@@ -410,94 +338,6 @@ Global
 		{7F854B13-37EA-4956-BAEE-9715AE9F4579}.Release|Win32.Build.0 = Release|Win32
 		{7F854B13-37EA-4956-BAEE-9715AE9F4579}.Release|x64.ActiveCfg = Release|x64
 		{7F854B13-37EA-4956-BAEE-9715AE9F4579}.Release|x64.Build.0 = Release|x64
-		{8DE3A1E9-BCD9-429D-A81D-35B6F86AA0AA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8DE3A1E9-BCD9-429D-A81D-35B6F86AA0AA}.Debug|Win32.Build.0 = Debug|Win32
-		{8DE3A1E9-BCD9-429D-A81D-35B6F86AA0AA}.Debug|x64.ActiveCfg = Debug|x64
-		{8DE3A1E9-BCD9-429D-A81D-35B6F86AA0AA}.Debug|x64.Build.0 = Debug|x64
-		{8DE3A1E9-BCD9-429D-A81D-35B6F86AA0AA}.Release|Win32.ActiveCfg = Release|Win32
-		{8DE3A1E9-BCD9-429D-A81D-35B6F86AA0AA}.Release|Win32.Build.0 = Release|Win32
-		{8DE3A1E9-BCD9-429D-A81D-35B6F86AA0AA}.Release|x64.ActiveCfg = Release|x64
-		{8DE3A1E9-BCD9-429D-A81D-35B6F86AA0AA}.Release|x64.Build.0 = Release|x64
-		{DA88431F-AAD2-4A15-BBA0-8435A3DE8BE7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DA88431F-AAD2-4A15-BBA0-8435A3DE8BE7}.Debug|Win32.Build.0 = Debug|Win32
-		{DA88431F-AAD2-4A15-BBA0-8435A3DE8BE7}.Debug|x64.ActiveCfg = Debug|x64
-		{DA88431F-AAD2-4A15-BBA0-8435A3DE8BE7}.Debug|x64.Build.0 = Debug|x64
-		{DA88431F-AAD2-4A15-BBA0-8435A3DE8BE7}.Release|Win32.ActiveCfg = Release|Win32
-		{DA88431F-AAD2-4A15-BBA0-8435A3DE8BE7}.Release|Win32.Build.0 = Release|Win32
-		{DA88431F-AAD2-4A15-BBA0-8435A3DE8BE7}.Release|x64.ActiveCfg = Release|x64
-		{DA88431F-AAD2-4A15-BBA0-8435A3DE8BE7}.Release|x64.Build.0 = Release|x64
-		{196C0237-7C8A-4887-BD0F-52E6BBE1D61B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{196C0237-7C8A-4887-BD0F-52E6BBE1D61B}.Debug|Win32.Build.0 = Debug|Win32
-		{196C0237-7C8A-4887-BD0F-52E6BBE1D61B}.Debug|x64.ActiveCfg = Debug|x64
-		{196C0237-7C8A-4887-BD0F-52E6BBE1D61B}.Debug|x64.Build.0 = Debug|x64
-		{196C0237-7C8A-4887-BD0F-52E6BBE1D61B}.Release|Win32.ActiveCfg = Release|Win32
-		{196C0237-7C8A-4887-BD0F-52E6BBE1D61B}.Release|Win32.Build.0 = Release|Win32
-		{196C0237-7C8A-4887-BD0F-52E6BBE1D61B}.Release|x64.ActiveCfg = Release|x64
-		{196C0237-7C8A-4887-BD0F-52E6BBE1D61B}.Release|x64.Build.0 = Release|x64
-		{1957D0AE-B386-4BF0-A8B9-42229922BA91}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1957D0AE-B386-4BF0-A8B9-42229922BA91}.Debug|Win32.Build.0 = Debug|Win32
-		{1957D0AE-B386-4BF0-A8B9-42229922BA91}.Debug|x64.ActiveCfg = Debug|x64
-		{1957D0AE-B386-4BF0-A8B9-42229922BA91}.Debug|x64.Build.0 = Debug|x64
-		{1957D0AE-B386-4BF0-A8B9-42229922BA91}.Release|Win32.ActiveCfg = Release|Win32
-		{1957D0AE-B386-4BF0-A8B9-42229922BA91}.Release|Win32.Build.0 = Release|Win32
-		{1957D0AE-B386-4BF0-A8B9-42229922BA91}.Release|x64.ActiveCfg = Release|x64
-		{1957D0AE-B386-4BF0-A8B9-42229922BA91}.Release|x64.Build.0 = Release|x64
-		{7D81F099-33CC-4FF3-A465-3943CB3F70C6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7D81F099-33CC-4FF3-A465-3943CB3F70C6}.Debug|Win32.Build.0 = Debug|Win32
-		{7D81F099-33CC-4FF3-A465-3943CB3F70C6}.Debug|x64.ActiveCfg = Debug|x64
-		{7D81F099-33CC-4FF3-A465-3943CB3F70C6}.Debug|x64.Build.0 = Debug|x64
-		{7D81F099-33CC-4FF3-A465-3943CB3F70C6}.Release|Win32.ActiveCfg = Release|Win32
-		{7D81F099-33CC-4FF3-A465-3943CB3F70C6}.Release|Win32.Build.0 = Release|Win32
-		{7D81F099-33CC-4FF3-A465-3943CB3F70C6}.Release|x64.ActiveCfg = Release|x64
-		{7D81F099-33CC-4FF3-A465-3943CB3F70C6}.Release|x64.Build.0 = Release|x64
-		{99331043-10E4-4171-940E-D43E51B0401B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{99331043-10E4-4171-940E-D43E51B0401B}.Debug|Win32.Build.0 = Debug|Win32
-		{99331043-10E4-4171-940E-D43E51B0401B}.Debug|x64.ActiveCfg = Debug|x64
-		{99331043-10E4-4171-940E-D43E51B0401B}.Debug|x64.Build.0 = Debug|x64
-		{99331043-10E4-4171-940E-D43E51B0401B}.Release|Win32.ActiveCfg = Release|Win32
-		{99331043-10E4-4171-940E-D43E51B0401B}.Release|Win32.Build.0 = Release|Win32
-		{99331043-10E4-4171-940E-D43E51B0401B}.Release|x64.ActiveCfg = Release|x64
-		{99331043-10E4-4171-940E-D43E51B0401B}.Release|x64.Build.0 = Release|x64
-		{DD92D185-5AE5-4E39-90C0-D9804E85768F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DD92D185-5AE5-4E39-90C0-D9804E85768F}.Debug|Win32.Build.0 = Debug|Win32
-		{DD92D185-5AE5-4E39-90C0-D9804E85768F}.Debug|x64.ActiveCfg = Debug|x64
-		{DD92D185-5AE5-4E39-90C0-D9804E85768F}.Debug|x64.Build.0 = Debug|x64
-		{DD92D185-5AE5-4E39-90C0-D9804E85768F}.Release|Win32.ActiveCfg = Release|Win32
-		{DD92D185-5AE5-4E39-90C0-D9804E85768F}.Release|Win32.Build.0 = Release|Win32
-		{DD92D185-5AE5-4E39-90C0-D9804E85768F}.Release|x64.ActiveCfg = Release|x64
-		{DD92D185-5AE5-4E39-90C0-D9804E85768F}.Release|x64.Build.0 = Release|x64
-		{EE41CC3A-FBC3-434E-B8E9-810D0287BC0D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{EE41CC3A-FBC3-434E-B8E9-810D0287BC0D}.Debug|Win32.Build.0 = Debug|Win32
-		{EE41CC3A-FBC3-434E-B8E9-810D0287BC0D}.Debug|x64.ActiveCfg = Debug|x64
-		{EE41CC3A-FBC3-434E-B8E9-810D0287BC0D}.Debug|x64.Build.0 = Debug|x64
-		{EE41CC3A-FBC3-434E-B8E9-810D0287BC0D}.Release|Win32.ActiveCfg = Release|Win32
-		{EE41CC3A-FBC3-434E-B8E9-810D0287BC0D}.Release|Win32.Build.0 = Release|Win32
-		{EE41CC3A-FBC3-434E-B8E9-810D0287BC0D}.Release|x64.ActiveCfg = Release|x64
-		{EE41CC3A-FBC3-434E-B8E9-810D0287BC0D}.Release|x64.Build.0 = Release|x64
-		{FC2C1A39-F5E3-4791-B425-E74E5F296C4B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FC2C1A39-F5E3-4791-B425-E74E5F296C4B}.Debug|Win32.Build.0 = Debug|Win32
-		{FC2C1A39-F5E3-4791-B425-E74E5F296C4B}.Debug|x64.ActiveCfg = Debug|x64
-		{FC2C1A39-F5E3-4791-B425-E74E5F296C4B}.Debug|x64.Build.0 = Debug|x64
-		{FC2C1A39-F5E3-4791-B425-E74E5F296C4B}.Release|Win32.ActiveCfg = Release|Win32
-		{FC2C1A39-F5E3-4791-B425-E74E5F296C4B}.Release|Win32.Build.0 = Release|Win32
-		{FC2C1A39-F5E3-4791-B425-E74E5F296C4B}.Release|x64.ActiveCfg = Release|x64
-		{FC2C1A39-F5E3-4791-B425-E74E5F296C4B}.Release|x64.Build.0 = Release|x64
-		{D88692A8-F0A3-4B13-A35B-89D2DDA6A3FB}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D88692A8-F0A3-4B13-A35B-89D2DDA6A3FB}.Debug|Win32.Build.0 = Debug|Win32
-		{D88692A8-F0A3-4B13-A35B-89D2DDA6A3FB}.Debug|x64.ActiveCfg = Debug|x64
-		{D88692A8-F0A3-4B13-A35B-89D2DDA6A3FB}.Debug|x64.Build.0 = Debug|x64
-		{D88692A8-F0A3-4B13-A35B-89D2DDA6A3FB}.Release|Win32.ActiveCfg = Release|Win32
-		{D88692A8-F0A3-4B13-A35B-89D2DDA6A3FB}.Release|Win32.Build.0 = Release|Win32
-		{D88692A8-F0A3-4B13-A35B-89D2DDA6A3FB}.Release|x64.ActiveCfg = Release|x64
-		{D88692A8-F0A3-4B13-A35B-89D2DDA6A3FB}.Release|x64.Build.0 = Release|x64
-		{CF3A5226-1264-4735-83AE-A65C349FC61E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CF3A5226-1264-4735-83AE-A65C349FC61E}.Debug|Win32.Build.0 = Debug|Win32
-		{CF3A5226-1264-4735-83AE-A65C349FC61E}.Debug|x64.ActiveCfg = Debug|x64
-		{CF3A5226-1264-4735-83AE-A65C349FC61E}.Debug|x64.Build.0 = Debug|x64
-		{CF3A5226-1264-4735-83AE-A65C349FC61E}.Release|Win32.ActiveCfg = Release|Win32
-		{CF3A5226-1264-4735-83AE-A65C349FC61E}.Release|Win32.Build.0 = Release|Win32
-		{CF3A5226-1264-4735-83AE-A65C349FC61E}.Release|x64.ActiveCfg = Release|x64
-		{CF3A5226-1264-4735-83AE-A65C349FC61E}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/plugins/PluginUpdater/src/Scanner.cpp b/plugins/PluginUpdater/src/Scanner.cpp
index 08972d54ce..e657b7b114 100644
--- a/plugins/PluginUpdater/src/Scanner.cpp
+++ b/plugins/PluginUpdater/src/Scanner.cpp
@@ -74,24 +74,41 @@ struct
 }
 static renameTable[] =
 {
-	{ _T("svc_dbepp.dll"),   _T("Plugins\\dbeditorpp.dll") },
-	{ _T("svc_crshdmp.dll"), _T("Plugins\\crashdumper.dll") },
-	{ _T("svc_vi.dll"),      _T("Plugins\\versioninfo.dll") },
-	{ _T("import_sa.dll"),   _T("Plugins\\import.dll") },
-	{ _T("newnr.dll"),       _T("Plugins\\notesreminders.dll") },
-	{ _T("dbtool.exe"),      _T("Plugins\\dbchecker.dll") },
-	{ _T("dbtool_sa.exe"),   _T("Plugins\\dbchecker.dll") },
+	{ _T("svc_dbepp.dll"),                  _T("Plugins\\dbeditorpp.dll") },
+	{ _T("svc_crshdmp.dll"),                _T("Plugins\\crashdumper.dll") },
+	{ _T("svc_vi.dll"),                     _T("Plugins\\versioninfo.dll") },
+	{ _T("import_sa.dll"),                  _T("Plugins\\import.dll") },
+	{ _T("newnr.dll"),                      _T("Plugins\\notesreminders.dll") },
+	{ _T("dbtool.exe"),                     _T("Plugins\\dbchecker.dll") },
+	{ _T("dbtool_sa.exe"),                  _T("Plugins\\dbchecker.dll") },
 	
-	{ _T("clienticons_multiprotocols.dll"), _T("Icons\\Fp_ClientIcons\\clienticons_multiproto.dll") },
-	{ _T("clienticons_general.dll"),        _T("Icons\\Fp_ClientIcons\\clienticons_miranda.dll") },
-	{ _T("clienticons_skype.dll"),          _T("Icons\\Fp_ClientIcons\\clienticons_others.dll") },
-	{ _T("clienticons_voip.dll"),           _T("Icons\\Fp_ClientIcons\\clienticons_overlays.dll") },
-	{ _T("clienticons_gadu.dll"),           _T("Icons\\Fp_ClientIcons\\clienticons_gg.dll") },
-
-	{ _T("clist_classic.dll"), _T("") },
-	{ _T("chat.dll"),          _T("") },
-	{ _T("srmm.dll"),          _T("") },
-	{ _T("extraicons.dll"),    _T("") },
+	{ _T("clienticons_general.dll"),        _T("Icons\\fp_icons.dll") },
+	{ _T("clienticons_miranda.dll"),        _T("Icons\\fp_icons.dll") },
+	{ _T("clienticons_aim.dll"),            _T("") },
+	{ _T("clienticons_gadu.dll"),           _T("") },
+	{ _T("clienticons_gg.dll"),             _T("") },
+	{ _T("clienticons_icq.dll"),            _T("") },
+	{ _T("clienticons_irc.dll"),            _T("") },
+	{ _T("clienticons_jabber.dll"),         _T("") },
+	{ _T("clienticons_mra.dll"),            _T("") },
+	{ _T("clienticons_msn.dll"),            _T("") },
+	{ _T("clienticons_multiproto.dll"),     _T("") },
+	{ _T("clienticons_multiprotocols.dll"), _T("") },
+	{ _T("clienticons_others.dll"),         _T("") },
+	{ _T("clienticons_overlsys.dll"),       _T("") },
+	{ _T("clienticons_packs.dll"),          _T("") },
+	{ _T("clienticons_qq.dll"),             _T("") },
+	{ _T("clienticons_rss.dll"),            _T("") },
+	{ _T("clienticons_skype.dll"),          _T("") },
+	{ _T("clienticons_tlen.dll"),           _T("") },
+	{ _T("clienticons_voip.dll"),           _T("") },
+	{ _T("clienticons_weather.dll"),        _T("") },
+	{ _T("clienticons_yahoo.dll"),          _T("") },
+	
+	{ _T("clist_classic.dll"),              _T("") },
+	{ _T("chat.dll"),                       _T("") },
+	{ _T("srmm.dll"),                       _T("") },
+	{ _T("extraicons.dll"),                 _T("") },
 };
 
 static bool CheckFileRename(const TCHAR *ptszOldName, TCHAR *pNewName)