387 files changed, 402 insertions, 570 deletions
diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln
index 086242e677..43ec27752b 100644
--- a/bin10/mir_full.sln
+++ b/bin10/mir_full.sln
@@ -24,9 +24,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Scriver", "..\plugins\Scriv
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ModernOpt", "..\plugins\modernopt\modernopt_10.vcxproj", "{153DD132-084C-4DE4-8F40-A088BCB22723}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TabSRMM", "..\plugins\Tabsrmm\tabsrmm_10.vcxproj", "{99D26CA1-BFD4-4E77-9A1E-919E54CF33F7}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TabSRMM", "..\plugins\TabSRMM\tabsrmm_10.vcxproj", "{99D26CA1-BFD4-4E77-9A1E-919E54CF33F7}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SRMM", "..\plugins\Srmm\srmm_10.vcxproj", "{F47EAB99-C78F-4A92-87D5-B0E16FE5A133}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SRMM", "..\plugins\SRMM\srmm_10.vcxproj", "{F47EAB99-C78F-4A92-87D5-B0E16FE5A133}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AIM", "..\protocols\AimOscar\aim_10.vcxproj", "{736E59E5-CDCE-4C88-9C3A-E7913D45C9EC}"
 EndProject
@@ -44,13 +44,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Miranda", "..\src\miranda32
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSN", "..\protocols\MSN\msn_10.vcxproj", "{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dbrw", "..\plugins\Dbrw\dbrw_10.vcxproj", "{0A3D4D77-77B8-B817-FC8B-535BDCD0980A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dbrw", "..\plugins\Dbrw\dbrw_10.vcxproj", "{4979B733-ED78-2ADF-A8D4-03F4B9B3CD51}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Clist_nicer", "..\plugins\clist_nicer\clist_nicer_10.vcxproj", "{3C42510C-A29E-4A53-899C-203BFA874E0B}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xStatus_ICQ", "..\protocols\IcqOscarJ\icons_pack\ICONS.vcxproj", "{500057D6-5563-7AEF-129A-FC17C88C5BC1}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xStatus_ICQ", "..\protocols\IcqOscarJ\icons_pack\ICONS.vcxproj", "{E98A8615-1082-1979-D6D8-F763F13BFCBD}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xStatus_Jabber", "..\protocols\JabberG\jabber_xstatus\JABBER_XSTATUS_10.vcxproj", "{C188A10E-AA70-BB1D-6B56-FC218C8FBB65}"
+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
@@ -58,11 +58,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cln_skinedit", "..\plugins\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dbtool", "..\tools\dbtool\dbtool_10.vcxproj", "{A2E9DA24-95E4-4414-94AF-488A382E276A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TabSRMM_icons", "..\plugins\Tabsrmm\icons\ICONS_NOVA\ICONS_NOVA_10.vcxproj", "{F553F140-B7D3-4984-90B1-00D4831B8A6E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TabSRMM_icons", "..\plugins\TabSRMM\icons\ICONS_NOVA\ICONS_NOVA_10.vcxproj", "{F553F140-B7D3-4984-90B1-00D4831B8A6E}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AuthState", "..\plugins\AuthState\authstate_10.vcxproj", "{DB315D7D-00BB-43B2-93A6-0430CA2B9F28}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AutoRun", "..\plugins\AutoRun\autorun.vcxproj", "{2CF5BEA8-BD73-ED7B-FC7C-32E7E972A630}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AutoRun", "..\plugins\AutoRun\autorun.vcxproj", "{6E46F54C-0614-0AF1-B236-D338DAD6DC00}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BASS_interface", "..\plugins\Bass_interface\Bass_interface.vcxproj", "{3933E789-D185-41DC-8169-9FF4365B6015}"
 EndProject
@@ -74,9 +74,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BuddyExpectator", "..\plugi
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Console", "..\plugins\Console\Console.vcxproj", "{A231E008-2D1A-4F24-95DD-59F56F85A499}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Contacts", "..\plugins\ContactsPlus\contacts.vcxproj", "{F4F2FD25-1553-FB72-F695-0701D20C3168}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Contacts", "..\plugins\ContactsPlus\contacts.vcxproj", "{4299EE1E-0D28-DC4B-3294-A53E9F319EE7}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Flags", "..\plugins\CountryFlags\flags.vcxproj", "{B4361FA0-4073-4B60-EE72-F5C08E6EDF61}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Flags", "..\plugins\CountryFlags\flags.vcxproj", "{E289453C-C665-996F-3A21-566D379C2B11}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CSList", "..\plugins\CSList\cslist_10.vcxproj", "{2AD2FF74-06E1-4BD8-984A-526F3C6315B3}"
 EndProject
@@ -106,7 +106,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Folders", "..\plugins\Folde
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Gender", "..\plugins\Gender\gender_10.vcxproj", "{9DF8913A-99A3-40D2-86FE-585EBDDCABB2}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LinkList", "..\plugins\HistoryLinkListPlus\linklist.vcxproj", "{850EC838-0EAD-45EB-6F1B-16DC90DCE18D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LinkList", "..\plugins\HistoryLinkListPlus\linklist.vcxproj", "{80502D81-63C9-D472-7E19-4CACFF4E17CC}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HistorySweeperLight", "..\plugins\HistorySweeperLight\historysweeperlight_10.vcxproj", "{9DE1F0B0-B9D1-4681-82E7-13CC3E047445}"
 EndProject
@@ -172,7 +172,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UInfoEx", "..\plugins\UserI
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Variables", "..\plugins\variables\Variables_10.vcxproj", "{3038EF69-85BE-4D92-9864-CD6A5EBB558A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "W7UI", "..\plugins\W7ui\w7ui_10.vcxproj", "{86704897-EABF-439D-BE0E-52CEA67C2C43}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "W7UI", "..\plugins\W7UI\w7ui_10.vcxproj", "{86704897-EABF-439D-BE0E-52CEA67C2C43}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WhenWasIt", "..\plugins\WhenWasIt\WhenWasIt\WhenWasIt_10.vcxproj", "{63E05ECA-0A63-479E-86BD-2CAF53869BDA}"
 EndProject
@@ -204,9 +204,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZeroNotify", "..\plugins\Ze
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KeyboardNotify", "..\plugins\KeyboardNotify\KeyboardNotify_10.vcxproj", "{A9265E36-7F2D-440C-BF3E-F447FDB6200F}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AssocMgr", "..\plugins\AssocMgr\assocmgr.vcxproj", "{B57D997C-73E1-D5F7-ECCA-C204345C04A3}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AssocMgr", "..\plugins\AssocMgr\assocmgr.vcxproj", "{4D00C99A-6D4C-A221-7761-C87B1E108C50}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewAwaySys", "..\plugins\NewAwaySysMod\NewAwaySys.vcxproj", "{6A516E27-AC50-5374-756B-A1558DB2EFA9}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewAwaySys", "..\plugins\NewAwaySysMod\NewAwaySys.vcxproj", "{1FF07EF3-125B-5761-F4B3-DB7330CFAC77}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClientIcons_AIM", "..\plugins\FingerPrintModPlus\iconpacks\ClientIcons_AIM.vcxproj", "{2D1D3D7C-F86B-4189-8D57-96575D441182}"
 EndProject
@@ -270,6 +270,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClientChangeNotify", "..\pl
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ListeningTo", "..\plugins\ListeningTo\listeningto.vcxproj", "{5FAA475D-0593-454F-8601-0D7150DCA4A0}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Omegle", "..\protocols\Omegle\omegle_10.vcxproj", "{D5E2FEC1-B29A-476C-BD41-469FE282EE0F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Omegle", "..\protocols\Omegle\omegle_icons_10.vcxproj", "{C5AB34D2-15F5-4CBA-8F42-DB48A4E52910}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libJSON", "..\plugins\JSON\libjson.vcxproj", "{F6B2FB04-4FFD-419F-BC9F-8CC43F00C2B0}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -454,10 +460,10 @@ Global
 		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Release|Win32.Build.0 = Release|Win32
 		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Release|x64.ActiveCfg = Release|x64
 		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Release|x64.Build.0 = Release|x64
-		{0A3D4D77-77B8-B817-FC8B-535BDCD0980A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0A3D4D77-77B8-B817-FC8B-535BDCD0980A}.Debug|x64.ActiveCfg = Debug|x64
-		{0A3D4D77-77B8-B817-FC8B-535BDCD0980A}.Release|Win32.ActiveCfg = Release|Win32
-		{0A3D4D77-77B8-B817-FC8B-535BDCD0980A}.Release|x64.ActiveCfg = Release|x64
+		{4979B733-ED78-2ADF-A8D4-03F4B9B3CD51}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4979B733-ED78-2ADF-A8D4-03F4B9B3CD51}.Debug|x64.ActiveCfg = Debug|x64
+		{4979B733-ED78-2ADF-A8D4-03F4B9B3CD51}.Release|Win32.ActiveCfg = Release|Win32
+		{4979B733-ED78-2ADF-A8D4-03F4B9B3CD51}.Release|x64.ActiveCfg = Release|x64
 		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Debug|Win32.Build.0 = Debug|Win32
 		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Debug|x64.ActiveCfg = Debug|x64
@@ -466,22 +472,22 @@ Global
 		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Release|Win32.Build.0 = Release|Win32
 		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Release|x64.ActiveCfg = Release|x64
 		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Release|x64.Build.0 = Release|x64
-		{500057D6-5563-7AEF-129A-FC17C88C5BC1}.Debug|Win32.ActiveCfg = Debug|Win32
-		{500057D6-5563-7AEF-129A-FC17C88C5BC1}.Debug|Win32.Build.0 = Debug|Win32
-		{500057D6-5563-7AEF-129A-FC17C88C5BC1}.Debug|x64.ActiveCfg = Debug|x64
-		{500057D6-5563-7AEF-129A-FC17C88C5BC1}.Debug|x64.Build.0 = Debug|x64
-		{500057D6-5563-7AEF-129A-FC17C88C5BC1}.Release|Win32.ActiveCfg = Release|Win32
-		{500057D6-5563-7AEF-129A-FC17C88C5BC1}.Release|Win32.Build.0 = Release|Win32
-		{500057D6-5563-7AEF-129A-FC17C88C5BC1}.Release|x64.ActiveCfg = Release|x64
-		{500057D6-5563-7AEF-129A-FC17C88C5BC1}.Release|x64.Build.0 = Release|x64
-		{C188A10E-AA70-BB1D-6B56-FC218C8FBB65}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C188A10E-AA70-BB1D-6B56-FC218C8FBB65}.Debug|Win32.Build.0 = Debug|Win32
-		{C188A10E-AA70-BB1D-6B56-FC218C8FBB65}.Debug|x64.ActiveCfg = Debug|x64
-		{C188A10E-AA70-BB1D-6B56-FC218C8FBB65}.Debug|x64.Build.0 = Debug|x64
-		{C188A10E-AA70-BB1D-6B56-FC218C8FBB65}.Release|Win32.ActiveCfg = Release|Win32
-		{C188A10E-AA70-BB1D-6B56-FC218C8FBB65}.Release|Win32.Build.0 = Release|Win32
-		{C188A10E-AA70-BB1D-6B56-FC218C8FBB65}.Release|x64.ActiveCfg = Release|x64
-		{C188A10E-AA70-BB1D-6B56-FC218C8FBB65}.Release|x64.Build.0 = Release|x64
+		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Debug|Win32.Build.0 = Debug|Win32
+		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Debug|x64.ActiveCfg = Debug|x64
+		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Debug|x64.Build.0 = Debug|x64
+		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Release|Win32.ActiveCfg = Release|Win32
+		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Release|Win32.Build.0 = Release|Win32
+		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Release|x64.ActiveCfg = Release|x64
+		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Release|x64.Build.0 = Release|x64
+		{6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E}.Debug|Win32.Build.0 = Debug|Win32
+		{6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E}.Debug|x64.ActiveCfg = Debug|x64
+		{6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E}.Debug|x64.Build.0 = Debug|x64
+		{6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E}.Release|Win32.ActiveCfg = Release|Win32
+		{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
@@ -522,14 +528,14 @@ Global
 		{DB315D7D-00BB-43B2-93A6-0430CA2B9F28}.Release|Win32.Build.0 = Release|Win32
 		{DB315D7D-00BB-43B2-93A6-0430CA2B9F28}.Release|x64.ActiveCfg = Release|x64
 		{DB315D7D-00BB-43B2-93A6-0430CA2B9F28}.Release|x64.Build.0 = Release|x64
-		{2CF5BEA8-BD73-ED7B-FC7C-32E7E972A630}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2CF5BEA8-BD73-ED7B-FC7C-32E7E972A630}.Debug|Win32.Build.0 = Debug|Win32
-		{2CF5BEA8-BD73-ED7B-FC7C-32E7E972A630}.Debug|x64.ActiveCfg = Debug|x64
-		{2CF5BEA8-BD73-ED7B-FC7C-32E7E972A630}.Debug|x64.Build.0 = Debug|x64
-		{2CF5BEA8-BD73-ED7B-FC7C-32E7E972A630}.Release|Win32.ActiveCfg = Release|Win32
-		{2CF5BEA8-BD73-ED7B-FC7C-32E7E972A630}.Release|Win32.Build.0 = Release|Win32
-		{2CF5BEA8-BD73-ED7B-FC7C-32E7E972A630}.Release|x64.ActiveCfg = Release|x64
-		{2CF5BEA8-BD73-ED7B-FC7C-32E7E972A630}.Release|x64.Build.0 = Release|x64
+		{6E46F54C-0614-0AF1-B236-D338DAD6DC00}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6E46F54C-0614-0AF1-B236-D338DAD6DC00}.Debug|Win32.Build.0 = Debug|Win32
+		{6E46F54C-0614-0AF1-B236-D338DAD6DC00}.Debug|x64.ActiveCfg = Debug|x64
+		{6E46F54C-0614-0AF1-B236-D338DAD6DC00}.Debug|x64.Build.0 = Debug|x64
+		{6E46F54C-0614-0AF1-B236-D338DAD6DC00}.Release|Win32.ActiveCfg = Release|Win32
+		{6E46F54C-0614-0AF1-B236-D338DAD6DC00}.Release|Win32.Build.0 = Release|Win32
+		{6E46F54C-0614-0AF1-B236-D338DAD6DC00}.Release|x64.ActiveCfg = Release|x64
+		{6E46F54C-0614-0AF1-B236-D338DAD6DC00}.Release|x64.Build.0 = Release|x64
 		{3933E789-D185-41DC-8169-9FF4365B6015}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3933E789-D185-41DC-8169-9FF4365B6015}.Debug|Win32.Build.0 = Debug|Win32
 		{3933E789-D185-41DC-8169-9FF4365B6015}.Debug|x64.ActiveCfg = Debug|x64
@@ -568,20 +574,20 @@ Global
 		{A231E008-2D1A-4F24-95DD-59F56F85A499}.Release|Win32.Build.0 = Release|Win32
 		{A231E008-2D1A-4F24-95DD-59F56F85A499}.Release|x64.ActiveCfg = Release|x64
 		{A231E008-2D1A-4F24-95DD-59F56F85A499}.Release|x64.Build.0 = Release|x64
-		{F4F2FD25-1553-FB72-F695-0701D20C3168}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F4F2FD25-1553-FB72-F695-0701D20C3168}.Debug|Win32.Build.0 = Debug|Win32
-		{F4F2FD25-1553-FB72-F695-0701D20C3168}.Debug|x64.ActiveCfg = Debug|x64
-		{F4F2FD25-1553-FB72-F695-0701D20C3168}.Debug|x64.Build.0 = Debug|x64
-		{F4F2FD25-1553-FB72-F695-0701D20C3168}.Release|Win32.ActiveCfg = Release|Win32
-		{F4F2FD25-1553-FB72-F695-0701D20C3168}.Release|Win32.Build.0 = Release|Win32
-		{F4F2FD25-1553-FB72-F695-0701D20C3168}.Release|x64.ActiveCfg = Release|x64
-		{F4F2FD25-1553-FB72-F695-0701D20C3168}.Release|x64.Build.0 = Release|x64
-		{B4361FA0-4073-4B60-EE72-F5C08E6EDF61}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B4361FA0-4073-4B60-EE72-F5C08E6EDF61}.Debug|Win32.Build.0 = Debug|Win32
-		{B4361FA0-4073-4B60-EE72-F5C08E6EDF61}.Debug|x64.ActiveCfg = Debug|Win32
-		{B4361FA0-4073-4B60-EE72-F5C08E6EDF61}.Release|Win32.ActiveCfg = Release|Win32
-		{B4361FA0-4073-4B60-EE72-F5C08E6EDF61}.Release|Win32.Build.0 = Release|Win32
-		{B4361FA0-4073-4B60-EE72-F5C08E6EDF61}.Release|x64.ActiveCfg = Release|Win32
+		{4299EE1E-0D28-DC4B-3294-A53E9F319EE7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4299EE1E-0D28-DC4B-3294-A53E9F319EE7}.Debug|Win32.Build.0 = Debug|Win32
+		{4299EE1E-0D28-DC4B-3294-A53E9F319EE7}.Debug|x64.ActiveCfg = Debug|x64
+		{4299EE1E-0D28-DC4B-3294-A53E9F319EE7}.Debug|x64.Build.0 = Debug|x64
+		{4299EE1E-0D28-DC4B-3294-A53E9F319EE7}.Release|Win32.ActiveCfg = Release|Win32
+		{4299EE1E-0D28-DC4B-3294-A53E9F319EE7}.Release|Win32.Build.0 = Release|Win32
+		{4299EE1E-0D28-DC4B-3294-A53E9F319EE7}.Release|x64.ActiveCfg = Release|x64
+		{4299EE1E-0D28-DC4B-3294-A53E9F319EE7}.Release|x64.Build.0 = Release|x64
+		{E289453C-C665-996F-3A21-566D379C2B11}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E289453C-C665-996F-3A21-566D379C2B11}.Debug|Win32.Build.0 = Debug|Win32
+		{E289453C-C665-996F-3A21-566D379C2B11}.Debug|x64.ActiveCfg = Debug|Win32
+		{E289453C-C665-996F-3A21-566D379C2B11}.Release|Win32.ActiveCfg = Release|Win32
+		{E289453C-C665-996F-3A21-566D379C2B11}.Release|Win32.Build.0 = Release|Win32
+		{E289453C-C665-996F-3A21-566D379C2B11}.Release|x64.ActiveCfg = Release|Win32
 		{2AD2FF74-06E1-4BD8-984A-526F3C6315B3}.Debug|Win32.ActiveCfg = Debug|Win32
 		{2AD2FF74-06E1-4BD8-984A-526F3C6315B3}.Debug|Win32.Build.0 = Debug|Win32
 		{2AD2FF74-06E1-4BD8-984A-526F3C6315B3}.Debug|x64.ActiveCfg = Debug|x64
@@ -687,14 +693,14 @@ Global
 		{9DF8913A-99A3-40D2-86FE-585EBDDCABB2}.Release|Win32.Build.0 = Release|Win32
 		{9DF8913A-99A3-40D2-86FE-585EBDDCABB2}.Release|x64.ActiveCfg = Release|x64
 		{9DF8913A-99A3-40D2-86FE-585EBDDCABB2}.Release|x64.Build.0 = Release|x64
-		{850EC838-0EAD-45EB-6F1B-16DC90DCE18D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{850EC838-0EAD-45EB-6F1B-16DC90DCE18D}.Debug|Win32.Build.0 = Debug|Win32
-		{850EC838-0EAD-45EB-6F1B-16DC90DCE18D}.Debug|x64.ActiveCfg = Debug|x64
-		{850EC838-0EAD-45EB-6F1B-16DC90DCE18D}.Debug|x64.Build.0 = Debug|x64
-		{850EC838-0EAD-45EB-6F1B-16DC90DCE18D}.Release|Win32.ActiveCfg = Release|Win32
-		{850EC838-0EAD-45EB-6F1B-16DC90DCE18D}.Release|Win32.Build.0 = Release|Win32
-		{850EC838-0EAD-45EB-6F1B-16DC90DCE18D}.Release|x64.ActiveCfg = Release|x64
-		{850EC838-0EAD-45EB-6F1B-16DC90DCE18D}.Release|x64.Build.0 = Release|x64
+		{80502D81-63C9-D472-7E19-4CACFF4E17CC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{80502D81-63C9-D472-7E19-4CACFF4E17CC}.Debug|Win32.Build.0 = Debug|Win32
+		{80502D81-63C9-D472-7E19-4CACFF4E17CC}.Debug|x64.ActiveCfg = Debug|x64
+		{80502D81-63C9-D472-7E19-4CACFF4E17CC}.Debug|x64.Build.0 = Debug|x64
+		{80502D81-63C9-D472-7E19-4CACFF4E17CC}.Release|Win32.ActiveCfg = Release|Win32
+		{80502D81-63C9-D472-7E19-4CACFF4E17CC}.Release|Win32.Build.0 = Release|Win32
+		{80502D81-63C9-D472-7E19-4CACFF4E17CC}.Release|x64.ActiveCfg = Release|x64
+		{80502D81-63C9-D472-7E19-4CACFF4E17CC}.Release|x64.Build.0 = Release|x64
 		{9DE1F0B0-B9D1-4681-82E7-13CC3E047445}.Debug|Win32.ActiveCfg = Debug|Win32
 		{9DE1F0B0-B9D1-4681-82E7-13CC3E047445}.Debug|Win32.Build.0 = Debug|Win32
 		{9DE1F0B0-B9D1-4681-82E7-13CC3E047445}.Debug|x64.ActiveCfg = Debug|Win32
@@ -1057,21 +1063,21 @@ Global
 		{A9265E36-7F2D-440C-BF3E-F447FDB6200F}.Release|Win32.ActiveCfg = Release|Win32
 		{A9265E36-7F2D-440C-BF3E-F447FDB6200F}.Release|Win32.Build.0 = Release|Win32
 		{A9265E36-7F2D-440C-BF3E-F447FDB6200F}.Release|x64.ActiveCfg = Release|x64
-		{B57D997C-73E1-D5F7-ECCA-C204345C04A3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B57D997C-73E1-D5F7-ECCA-C204345C04A3}.Debug|Win32.Build.0 = Debug|Win32
-		{B57D997C-73E1-D5F7-ECCA-C204345C04A3}.Debug|x64.ActiveCfg = Debug|x64
-		{B57D997C-73E1-D5F7-ECCA-C204345C04A3}.Debug|x64.Build.0 = Debug|x64
-		{B57D997C-73E1-D5F7-ECCA-C204345C04A3}.Release|Win32.ActiveCfg = Release|Win32
-		{B57D997C-73E1-D5F7-ECCA-C204345C04A3}.Release|Win32.Build.0 = Release|Win32
-		{B57D997C-73E1-D5F7-ECCA-C204345C04A3}.Release|x64.ActiveCfg = Release|x64
-		{6A516E27-AC50-5374-756B-A1558DB2EFA9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6A516E27-AC50-5374-756B-A1558DB2EFA9}.Debug|Win32.Build.0 = Debug|Win32
-		{6A516E27-AC50-5374-756B-A1558DB2EFA9}.Debug|x64.ActiveCfg = Debug|x64
-		{6A516E27-AC50-5374-756B-A1558DB2EFA9}.Debug|x64.Build.0 = Debug|x64
-		{6A516E27-AC50-5374-756B-A1558DB2EFA9}.Release|Win32.ActiveCfg = Release|Win32
-		{6A516E27-AC50-5374-756B-A1558DB2EFA9}.Release|Win32.Build.0 = Release|Win32
-		{6A516E27-AC50-5374-756B-A1558DB2EFA9}.Release|x64.ActiveCfg = Release|x64
-		{6A516E27-AC50-5374-756B-A1558DB2EFA9}.Release|x64.Build.0 = Release|x64
+		{4D00C99A-6D4C-A221-7761-C87B1E108C50}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4D00C99A-6D4C-A221-7761-C87B1E108C50}.Debug|Win32.Build.0 = Debug|Win32
+		{4D00C99A-6D4C-A221-7761-C87B1E108C50}.Debug|x64.ActiveCfg = Debug|x64
+		{4D00C99A-6D4C-A221-7761-C87B1E108C50}.Debug|x64.Build.0 = Debug|x64
+		{4D00C99A-6D4C-A221-7761-C87B1E108C50}.Release|Win32.ActiveCfg = Release|Win32
+		{4D00C99A-6D4C-A221-7761-C87B1E108C50}.Release|Win32.Build.0 = Release|Win32
+		{4D00C99A-6D4C-A221-7761-C87B1E108C50}.Release|x64.ActiveCfg = Release|x64
+		{1FF07EF3-125B-5761-F4B3-DB7330CFAC77}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1FF07EF3-125B-5761-F4B3-DB7330CFAC77}.Debug|Win32.Build.0 = Debug|Win32
+		{1FF07EF3-125B-5761-F4B3-DB7330CFAC77}.Debug|x64.ActiveCfg = Debug|x64
+		{1FF07EF3-125B-5761-F4B3-DB7330CFAC77}.Debug|x64.Build.0 = Debug|x64
+		{1FF07EF3-125B-5761-F4B3-DB7330CFAC77}.Release|Win32.ActiveCfg = Release|Win32
+		{1FF07EF3-125B-5761-F4B3-DB7330CFAC77}.Release|Win32.Build.0 = Release|Win32
+		{1FF07EF3-125B-5761-F4B3-DB7330CFAC77}.Release|x64.ActiveCfg = Release|x64
+		{1FF07EF3-125B-5761-F4B3-DB7330CFAC77}.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
@@ -1312,6 +1318,28 @@ Global
 		{5FAA475D-0593-454F-8601-0D7150DCA4A0}.Release|Win32.ActiveCfg = Release|Win32
 		{5FAA475D-0593-454F-8601-0D7150DCA4A0}.Release|Win32.Build.0 = Release|Win32
 		{5FAA475D-0593-454F-8601-0D7150DCA4A0}.Release|x64.ActiveCfg = Release|Win32
+		{D5E2FEC1-B29A-476C-BD41-469FE282EE0F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D5E2FEC1-B29A-476C-BD41-469FE282EE0F}.Debug|Win32.Build.0 = Debug|Win32
+		{D5E2FEC1-B29A-476C-BD41-469FE282EE0F}.Debug|x64.ActiveCfg = Debug|x64
+		{D5E2FEC1-B29A-476C-BD41-469FE282EE0F}.Debug|x64.Build.0 = Debug|x64
+		{D5E2FEC1-B29A-476C-BD41-469FE282EE0F}.Release|Win32.ActiveCfg = Release|Win32
+		{D5E2FEC1-B29A-476C-BD41-469FE282EE0F}.Release|Win32.Build.0 = Release|Win32
+		{D5E2FEC1-B29A-476C-BD41-469FE282EE0F}.Release|x64.ActiveCfg = Release|x64
+		{D5E2FEC1-B29A-476C-BD41-469FE282EE0F}.Release|x64.Build.0 = Release|x64
+		{C5AB34D2-15F5-4CBA-8F42-DB48A4E52910}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C5AB34D2-15F5-4CBA-8F42-DB48A4E52910}.Debug|Win32.Build.0 = Debug|Win32
+		{C5AB34D2-15F5-4CBA-8F42-DB48A4E52910}.Debug|x64.ActiveCfg = Debug|x64
+		{C5AB34D2-15F5-4CBA-8F42-DB48A4E52910}.Debug|x64.Build.0 = Debug|x64
+		{C5AB34D2-15F5-4CBA-8F42-DB48A4E52910}.Release|Win32.ActiveCfg = Release|Win32
+		{C5AB34D2-15F5-4CBA-8F42-DB48A4E52910}.Release|Win32.Build.0 = Release|Win32
+		{C5AB34D2-15F5-4CBA-8F42-DB48A4E52910}.Release|x64.ActiveCfg = Release|x64
+		{C5AB34D2-15F5-4CBA-8F42-DB48A4E52910}.Release|x64.Build.0 = Release|x64
+		{F6B2FB04-4FFD-419F-BC9F-8CC43F00C2B0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F6B2FB04-4FFD-419F-BC9F-8CC43F00C2B0}.Debug|Win32.Build.0 = Debug|Win32
+		{F6B2FB04-4FFD-419F-BC9F-8CC43F00C2B0}.Debug|x64.ActiveCfg = Debug|Win32
+		{F6B2FB04-4FFD-419F-BC9F-8CC43F00C2B0}.Release|Win32.ActiveCfg = Release|Win32
+		{F6B2FB04-4FFD-419F-BC9F-8CC43F00C2B0}.Release|Win32.Build.0 = Release|Win32
+		{F6B2FB04-4FFD-419F-BC9F-8CC43F00C2B0}.Release|x64.ActiveCfg = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/bin10/miranda32.sln b/bin10/miranda32.sln
index 22bccbf485..7a1ca27334 100644
--- a/bin10/miranda32.sln
+++ b/bin10/miranda32.sln
@@ -24,9 +24,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Scriver", "..\plugins\Scriv
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ModernOpt", "..\plugins\modernopt\modernopt_10.vcxproj", "{153DD132-084C-4DE4-8F40-A088BCB22723}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tabsrmm", "..\plugins\Tabsrmm\tabsrmm_10.vcxproj", "{99D26CA1-BFD4-4E77-9A1E-919E54CF33F7}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TabSRMM", "..\plugins\TabSRMM\tabsrmm_10.vcxproj", "{99D26CA1-BFD4-4E77-9A1E-919E54CF33F7}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Srmm", "..\plugins\Srmm\srmm_10.vcxproj", "{F47EAB99-C78F-4A92-87D5-B0E16FE5A133}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SRMM", "..\plugins\SRMM\srmm_10.vcxproj", "{F47EAB99-C78F-4A92-87D5-B0E16FE5A133}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AIM", "..\protocols\AimOscar\aim_10.vcxproj", "{736E59E5-CDCE-4C88-9C3A-E7913D45C9EC}"
 EndProject
@@ -44,13 +44,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Miranda", "..\src\miranda32
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSN", "..\protocols\MSN\msn_10.vcxproj", "{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dbrw", "..\plugins\Dbrw\dbrw_10.vcxproj", "{0A3D4D77-77B8-B817-FC8B-535BDCD0980A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dbrw", "..\plugins\Dbrw\dbrw_10.vcxproj", "{4979B733-ED78-2ADF-A8D4-03F4B9B3CD51}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Clist_nicer", "..\plugins\clist_nicer\clist_nicer_10.vcxproj", "{3C42510C-A29E-4A53-899C-203BFA874E0B}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xStatus_ICQ", "..\protocols\IcqOscarJ\icons_pack\ICONS.vcxproj", "{500057D6-5563-7AEF-129A-FC17C88C5BC1}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xStatus_ICQ", "..\protocols\IcqOscarJ\icons_pack\ICONS.vcxproj", "{E98A8615-1082-1979-D6D8-F763F13BFCBD}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xStatus_Jabber", "..\protocols\JabberG\jabber_xstatus\JABBER_XSTATUS_10.vcxproj", "{C188A10E-AA70-BB1D-6B56-FC218C8FBB65}"
+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
@@ -58,7 +58,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cln_skinedit", "..\plugins\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dbtool", "..\tools\dbtool\dbtool_10.vcxproj", "{A2E9DA24-95E4-4414-94AF-488A382E276A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tabsrmm_icons", "..\plugins\Tabsrmm\icons\ICONS_NOVA\ICONS_NOVA_10.vcxproj", "{F553F140-B7D3-4984-90B1-00D4831B8A6E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TabSRMM_icons", "..\plugins\TabSRMM\icons\ICONS_NOVA\ICONS_NOVA_10.vcxproj", "{F553F140-B7D3-4984-90B1-00D4831B8A6E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -244,10 +244,10 @@ Global
 		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Release|Win32.Build.0 = Release|Win32
 		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Release|x64.ActiveCfg = Release|x64
 		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Release|x64.Build.0 = Release|x64
-		{0A3D4D77-77B8-B817-FC8B-535BDCD0980A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0A3D4D77-77B8-B817-FC8B-535BDCD0980A}.Debug|x64.ActiveCfg = Debug|x64
-		{0A3D4D77-77B8-B817-FC8B-535BDCD0980A}.Release|Win32.ActiveCfg = Release|Win32
-		{0A3D4D77-77B8-B817-FC8B-535BDCD0980A}.Release|x64.ActiveCfg = Release|x64
+		{4979B733-ED78-2ADF-A8D4-03F4B9B3CD51}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4979B733-ED78-2ADF-A8D4-03F4B9B3CD51}.Debug|x64.ActiveCfg = Debug|x64
+		{4979B733-ED78-2ADF-A8D4-03F4B9B3CD51}.Release|Win32.ActiveCfg = Release|Win32
+		{4979B733-ED78-2ADF-A8D4-03F4B9B3CD51}.Release|x64.ActiveCfg = Release|x64
 		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Debug|Win32.Build.0 = Debug|Win32
 		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Debug|x64.ActiveCfg = Debug|x64
@@ -256,22 +256,22 @@ Global
 		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Release|Win32.Build.0 = Release|Win32
 		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Release|x64.ActiveCfg = Release|x64
 		{3C42510C-A29E-4A53-899C-203BFA874E0B}.Release|x64.Build.0 = Release|x64
-		{500057D6-5563-7AEF-129A-FC17C88C5BC1}.Debug|Win32.ActiveCfg = Debug|Win32
-		{500057D6-5563-7AEF-129A-FC17C88C5BC1}.Debug|Win32.Build.0 = Debug|Win32
-		{500057D6-5563-7AEF-129A-FC17C88C5BC1}.Debug|x64.ActiveCfg = Debug|x64
-		{500057D6-5563-7AEF-129A-FC17C88C5BC1}.Debug|x64.Build.0 = Debug|x64
-		{500057D6-5563-7AEF-129A-FC17C88C5BC1}.Release|Win32.ActiveCfg = Release|Win32
-		{500057D6-5563-7AEF-129A-FC17C88C5BC1}.Release|Win32.Build.0 = Release|Win32
-		{500057D6-5563-7AEF-129A-FC17C88C5BC1}.Release|x64.ActiveCfg = Release|x64
-		{500057D6-5563-7AEF-129A-FC17C88C5BC1}.Release|x64.Build.0 = Release|x64
-		{C188A10E-AA70-BB1D-6B56-FC218C8FBB65}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C188A10E-AA70-BB1D-6B56-FC218C8FBB65}.Debug|Win32.Build.0 = Debug|Win32
-		{C188A10E-AA70-BB1D-6B56-FC218C8FBB65}.Debug|x64.ActiveCfg = Debug|x64
-		{C188A10E-AA70-BB1D-6B56-FC218C8FBB65}.Debug|x64.Build.0 = Debug|x64
-		{C188A10E-AA70-BB1D-6B56-FC218C8FBB65}.Release|Win32.ActiveCfg = Release|Win32
-		{C188A10E-AA70-BB1D-6B56-FC218C8FBB65}.Release|Win32.Build.0 = Release|Win32
-		{C188A10E-AA70-BB1D-6B56-FC218C8FBB65}.Release|x64.ActiveCfg = Release|x64
-		{C188A10E-AA70-BB1D-6B56-FC218C8FBB65}.Release|x64.Build.0 = Release|x64
+		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Debug|Win32.Build.0 = Debug|Win32
+		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Debug|x64.ActiveCfg = Debug|x64
+		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Debug|x64.Build.0 = Debug|x64
+		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Release|Win32.ActiveCfg = Release|Win32
+		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Release|Win32.Build.0 = Release|Win32
+		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Release|x64.ActiveCfg = Release|x64
+		{E98A8615-1082-1979-D6D8-F763F13BFCBD}.Release|x64.Build.0 = Release|x64
+		{6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E}.Debug|Win32.Build.0 = Debug|Win32
+		{6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E}.Debug|x64.ActiveCfg = Debug|x64
+		{6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E}.Debug|x64.Build.0 = Debug|x64
+		{6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E}.Release|Win32.ActiveCfg = Release|Win32
+		{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
diff --git a/include/m_version.h b/include/m_version.h
index c1faa7a5e3..4ae415a888 100644
--- a/include/m_version.h
+++ b/include/m_version.h
@@ -27,10 +27,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define MIRANDA_MAKE_VERSION(a,b,c,d)   (((((DWORD)(a))&0xFF)<<24)|((((DWORD)(b))&0xFF)<<16)|((((DWORD)(c))&0xFF)<<8)|(((DWORD)(d))&0xFF))
 #endif
 
-#define MIRANDA_VERSION_FILEVERSION 0,92,1,110                                
-#define MIRANDA_VERSION_STRING      "0.92.1.110"                              
-#define MIRANDA_VERSION_DISPLAY     "0.92.1 alpha build #110"                 
-#define MIRANDA_VERSION_DWORD       MIRANDA_MAKE_VERSION(0, 92, 1, 110)       
+#define MIRANDA_VERSION_FILEVERSION 0,92,1,139                                
+#define MIRANDA_VERSION_STRING      "0.92.1.139"                              
+#define MIRANDA_VERSION_DISPLAY     "0.92.1 alpha build #139"                 
+#define MIRANDA_VERSION_DWORD       MIRANDA_MAKE_VERSION(0, 92, 1, 139)       
 #define MIRANDA_VERSION_CORE        MIRANDA_MAKE_VERSION(0, 92, 1, 0)        
 #define MIRANDA_VERSION_CORE_STRING "0.92.1.0"                               
                                                                               
diff --git a/plugins/Clist_nicer/INCLUDE/m_cln_skinedit.h b/plugins/Clist_nicer/INCLUDE/m_cln_skinedit.h
new file mode 100644
index 0000000000..a1e69bb6e1
--- /dev/null
+++ b/plugins/Clist_nicer/INCLUDE/m_cln_skinedit.h
@@ -0,0 +1,174 @@
+
+/*
+ * services
+ */
+
+#define MS_CLNSE_INVOKE "CLN_Skinedit/Invoke"
+#define MS_CLNSE_FILLBYCURRENTSEL "CLN_Skinedit/FillByCurrentSel"
+
+/*
+ * data structs
+ */
+
+typedef struct _tagImageItem {
+    char    szName[40];
+    HBITMAP hbm;
+    BYTE    bLeft, bRight, bTop, bBottom;      // sizing margins
+    BYTE    alpha;
+    DWORD   dwFlags;
+    HDC     hdc;
+    HBITMAP hbmOld;
+    LONG    inner_height, inner_width;
+    LONG    width, height;
+    BLENDFUNCTION bf;
+    BYTE    bStretch;
+    HBRUSH  fillBrush;
+    LONG    glyphMetrics[4];
+    struct  _tagImageItem *nextItem;
+} ImageItem;
+
+typedef struct _tagButtonItem {
+    char    szName[40];
+    HWND    hWnd;
+    LONG    xOff, yOff;
+    LONG    width, height;
+    ImageItem *imgNormal, *imgPressed, *imgHover;
+    LONG    normalGlyphMetrics[4];
+    LONG    hoverGlyphMetrics[4];
+    LONG    pressedGlyphMetrics[4];
+    DWORD   dwFlags, dwStockFlags;
+    DWORD   uId;
+    TCHAR   szTip[256];
+    char    szService[256];
+    char    szModule[256], szSetting[256];
+    BYTE    bValuePush[256], bValueRelease[256];
+    DWORD   type;
+    void    (*pfnAction)(struct _tagButtonItem *item, HWND hwndDlg, struct MessageWindowData *dat, HWND hwndItem);
+    void    (*pfnCallback)(struct _tagButtonItem *item, HWND hwndDlg, struct MessageWindowData *dat, HWND hwndItem);
+    TCHAR   tszLabel[40];
+    struct  _tagButtonItem *nextItem;
+} ButtonItem;
+
+typedef struct _tagButtonSet {
+    ButtonItem  *items;
+    LONG        left, top, right, bottom;               // client area offsets, calculated from button layout
+} ButtonSet;
+
+typedef struct {
+    char szName[40];
+    char szDBname[40];
+    int statusID;
+
+    BYTE GRADIENT;
+    BYTE CORNER;
+
+    DWORD COLOR;
+    DWORD COLOR2;
+
+    BYTE COLOR2_TRANSPARENT;
+
+    DWORD TEXTCOLOR;
+
+    int ALPHA;
+
+    int MARGIN_LEFT;
+    int MARGIN_TOP;
+    int MARGIN_RIGHT;
+    int MARGIN_BOTTOM;
+    BYTE IGNORED;
+    DWORD BORDERSTYLE;
+    ImageItem *imageItem;
+} StatusItems_t;
+
+typedef struct {
+    BOOL bGRADIENT;
+    BOOL bCORNER;
+    BOOL bCOLOR;
+    BOOL bCOLOR2;
+    BOOL bCOLOR2_TRANSPARENT;
+    BOOL bTEXTCOLOR;
+    BOOL bALPHA;
+    BOOL bMARGIN_LEFT;
+    BOOL bMARGIN_TOP;
+    BOOL bMARGIN_RIGHT;
+    BOOL bMARGIN_BOTTOM;
+    BOOL bIGNORED;
+    BOOL bBORDERSTYLE;
+} ChangedSItems_t;
+
+typedef struct _tagSkinDescription {
+    DWORD           cbSize;
+    StatusItems_t   *StatusItems;
+    int             lastItem;
+    int             firstItem;
+    char            szModule[100];
+    HWND            hWndParent, hWndTab;
+    HWND            hwndCLUI;
+    HWND            hwndSkinEdit;                       /* out param */
+    HWND            hwndImageEdit;                      /* out param */
+    HMENU           hMenuItems;
+    void            (*pfnSaveCompleteStruct)(void);
+    void            (*pfnClcOptionsChanged )(void);
+    void*           (*pfnMalloc)(unsigned int);
+    void            (*pfnFree)(void);
+    void*           (*pfnRealloc)(void *, unsigned int);
+    void*           reserved[20];
+} SKINDESCRIPTION;
+
+// defines
+
+// FLAGS
+#define CORNER_NONE 0
+#define CORNER_ACTIVE 1
+#define CORNER_TL 2
+#define CORNER_TR 4
+#define CORNER_BR 8
+#define CORNER_BL 16
+
+#define GRADIENT_NONE 0
+#define GRADIENT_ACTIVE 1
+#define GRADIENT_LR 2
+#define GRADIENT_RL 4
+#define GRADIENT_TB 8
+#define GRADIENT_BT 16
+
+#define IMAGE_PERPIXEL_ALPHA 1
+#define IMAGE_FLAG_DIVIDED 2
+#define IMAGE_FILLSOLID 4
+#define IMAGE_GLYPH 8
+
+#define IMAGE_STRETCH_V 1
+#define IMAGE_STRETCH_H 2
+#define IMAGE_STRETCH_B 4
+
+#define BUTTON_ISINTERNAL 1
+#define BUTTON_ISTOGGLE 2
+#define BUTTON_ISSERVICE 4
+#define BUTTON_ISPROTOSERVICE 8
+#define BUTTON_PASSHCONTACTW 16
+#define BUTTON_PASSHCONTACTL 32
+#define BUTTON_ISDBACTION    64
+#define BUTTON_ISCONTACTDBACTION 128
+#define BUTTON_DBACTIONONCONTACT 256
+#define BUTTON_ISSIDEBAR 512
+#define BUTTON_NORMALGLYPHISICON 1024
+#define BUTTON_PRESSEDGLYPHISICON 2048
+#define BUTTON_HOVERGLYPHISICON 4096
+#define BUTTON_HASLABEL 8192
+
+#define CLCDEFAULT_GRADIENT 0
+#define CLCDEFAULT_CORNER 0
+
+#define CLCDEFAULT_COLOR 0xd0d0d0
+#define CLCDEFAULT_COLOR2 0xd0d0d0
+
+#define CLCDEFAULT_TEXTCOLOR 0x000000
+
+#define CLCDEFAULT_COLOR2_TRANSPARENT 1
+
+#define CLCDEFAULT_ALPHA 100
+#define CLCDEFAULT_MRGN_LEFT 0
+#define CLCDEFAULT_MRGN_TOP 0
+#define CLCDEFAULT_MRGN_RIGHT 0
+#define CLCDEFAULT_MRGN_BOTTOM 0
+#define CLCDEFAULT_IGNORE 1
diff --git a/plugins/CommonLibs/GroupCheckbox.cpp b/plugins/CommonLibs/GroupCheckbox.cpp
index 20276fcbf3..b69211e330 100644
--- a/plugins/CommonLibs/GroupCheckbox.cpp
+++ b/plugins/CommonLibs/GroupCheckbox.cpp
@@ -60,7 +60,7 @@ public:
 
 static int CALLBACK CheckboxWndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
 {
-	CCheckboxData *dat = (CCheckboxData*)GetWindowLong(hWnd, GWL_USERDATA);
+	CCheckboxData *dat = (CCheckboxData*)GetWindowLong(hWnd, GWLP_USERDATA);
 	if (!dat)
 	{
 		return 0;
@@ -381,7 +381,7 @@ static int CALLBACK CheckboxWndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM l
 			{
 				DeleteObject(dat->hFont);
 			}
-			SetWindowLong(hWnd, GWL_USERDATA, NULL);
+			SetWindowLong(hWnd, GWLP_USERDATA, NULL);
 			CallWindowProc(dat->OldWndProc, hWnd, Msg, wParam, lParam);
 			delete dat;
 			return 0;
@@ -393,7 +393,7 @@ static int CALLBACK CheckboxWndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM l
 int MakeGroupCheckbox(HWND hWndCheckbox)
 { // workaround to make SetTextColor work in WM_CTLCOLORSTATIC with windows themes enabled
 	CCheckboxData *dat = new CCheckboxData();
-	dat->OldWndProc = (WNDPROC)GetWindowLong(hWndCheckbox, GWL_WNDPROC);
+	dat->OldWndProc = (WNDPROC)GetWindowLong(hWndCheckbox, GWLP_WNDPROC);
 	dat->State = SendMessage(hWndCheckbox, BM_GETSTATE, 0, 0);
 	long Style = GetWindowLong(hWndCheckbox, GWL_STYLE);
 	dat->Style = Style & (BS_CHECKBOX | BS_AUTOCHECKBOX | BS_3STATE | BS_AUTO3STATE);
@@ -401,8 +401,8 @@ int MakeGroupCheckbox(HWND hWndCheckbox)
   Style &= ~(BS_CHECKBOX | BS_AUTOCHECKBOX | BS_3STATE | BS_AUTO3STATE);
   Style |= BS_OWNERDRAW;
 	SetWindowLong(hWndCheckbox, GWL_STYLE, Style);
-	SetWindowLong(hWndCheckbox, GWL_USERDATA, (LONG)dat);
-	SetWindowLong(hWndCheckbox, GWL_WNDPROC, (LONG)CheckboxWndProc);
+	SetWindowLong(hWndCheckbox, GWLP_USERDATA, (LONG)dat);
+	SetWindowLong(hWndCheckbox, GWLP_WNDPROC, (LONG)CheckboxWndProc);
 	SendMessage(hWndCheckbox, UM_INITCHECKBOX, 0, 0);
 	return 0;
 }
diff --git a/plugins/CommonLibs/ThemedImageCheckbox.cpp b/plugins/CommonLibs/ThemedImageCheckbox.cpp
index ea0fbcea0a..ae239369b7 100644
--- a/plugins/CommonLibs/ThemedImageCheckbox.cpp
+++ b/plugins/CommonLibs/ThemedImageCheckbox.cpp
@@ -59,7 +59,7 @@ public:
 
 static int CALLBACK CheckboxWndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
 {
-	CCheckboxData *dat = (CCheckboxData*)GetWindowLong(hWnd, GWL_USERDATA);
+	CCheckboxData *dat = (CCheckboxData*)GetWindowLong(hWnd, GWLP_USERDATA);
 	if (!dat)
 	{
 		return 0;
@@ -355,7 +355,7 @@ static int CALLBACK CheckboxWndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM l
 		} break;
 		case WM_DESTROY:
 		{
-			SetWindowLong(hWnd, GWL_USERDATA, NULL);
+			SetWindowLong(hWnd, GWLP_USERDATA, NULL);
 			CallWindowProc(dat->OldWndProc, hWnd, Msg, wParam, lParam);
 			delete dat;
 			return 0;
@@ -367,7 +367,7 @@ static int CALLBACK CheckboxWndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM l
 int MakeThemedImageCheckbox(HWND hWndCheckbox)
 { // workaround to make checkbox with BS_ICON or BS_BITMAP work with windows themes enabled
 	CCheckboxData *dat = new CCheckboxData();
-	dat->OldWndProc = (WNDPROC)GetWindowLong(hWndCheckbox, GWL_WNDPROC);
+	dat->OldWndProc = (WNDPROC)GetWindowLong(hWndCheckbox, GWLP_WNDPROC);
 	dat->State = SendMessage(hWndCheckbox, BM_GETSTATE, 0, 0);
 	long Style = GetWindowLong(hWndCheckbox, GWL_STYLE);
 	_ASSERT(Style & BS_ICON || Style & BS_BITMAP);
@@ -376,7 +376,7 @@ int MakeThemedImageCheckbox(HWND hWndCheckbox)
   Style &= ~(BS_CHECKBOX | BS_AUTOCHECKBOX | BS_3STATE | BS_AUTO3STATE);
   Style |= BS_OWNERDRAW;
 	SetWindowLong(hWndCheckbox, GWL_STYLE, Style);
-	SetWindowLong(hWndCheckbox, GWL_USERDATA, (LONG)dat);
-	SetWindowLong(hWndCheckbox, GWL_WNDPROC, (LONG)CheckboxWndProc);
+	SetWindowLong(hWndCheckbox, GWLP_USERDATA, (LONG)dat);
+	SetWindowLong(hWndCheckbox, GWLP_WNDPROC, (LONG)CheckboxWndProc);
 	return 0;
 }
diff --git a/plugins/ExternalAPI/m_cln_skinedit.h b/plugins/ExternalAPI/m_cln_skinedit.h
index a1e69bb6e1..5ee66829c5 100644
--- a/plugins/ExternalAPI/m_cln_skinedit.h
+++ b/plugins/ExternalAPI/m_cln_skinedit.h
@@ -10,32 +10,18 @@
  * data structs
  */
 
-typedef struct _tagImageItem {
-    char    szName[40];
-    HBITMAP hbm;
-    BYTE    bLeft, bRight, bTop, bBottom;      // sizing margins
-    BYTE    alpha;
-    DWORD   dwFlags;
-    HDC     hdc;
-    HBITMAP hbmOld;
-    LONG    inner_height, inner_width;
-    LONG    width, height;
-    BLENDFUNCTION bf;
-    BYTE    bStretch;
-    HBRUSH  fillBrush;
-    LONG    glyphMetrics[4];
-    struct  _tagImageItem *nextItem;
-} ImageItem;
-
-typedef struct _tagButtonItem {
-    char    szName[40];
+struct TWindowData;
+class CImageItem;
+
+struct ButtonItem {
+    TCHAR   szName[40];
     HWND    hWnd;
     LONG    xOff, yOff;
     LONG    width, height;
-    ImageItem *imgNormal, *imgPressed, *imgHover;
-    LONG    normalGlyphMetrics[4];
-    LONG    hoverGlyphMetrics[4];
-    LONG    pressedGlyphMetrics[4];
+    CImageItem *imgNormal, *imgPressed, *imgHover;
+    LONG_PTR normalGlyphMetrics[4];
+    LONG_PTR hoverGlyphMetrics[4];
+    LONG_PTR pressedGlyphMetrics[4];
     DWORD   dwFlags, dwStockFlags;
     DWORD   uId;
     TCHAR   szTip[256];
@@ -43,19 +29,21 @@ typedef struct _tagButtonItem {
     char    szModule[256], szSetting[256];
     BYTE    bValuePush[256], bValueRelease[256];
     DWORD   type;
-    void    (*pfnAction)(struct _tagButtonItem *item, HWND hwndDlg, struct MessageWindowData *dat, HWND hwndItem);
-    void    (*pfnCallback)(struct _tagButtonItem *item, HWND hwndDlg, struct MessageWindowData *dat, HWND hwndItem);
+    void    (*pfnAction)(ButtonItem *item, HWND hwndDlg, TWindowData *dat, HWND hwndItem);
+    void    (*pfnCallback)(ButtonItem *item, HWND hwndDlg, TWindowData *dat, HWND hwndItem);
     TCHAR   tszLabel[40];
-    struct  _tagButtonItem *nextItem;
-} ButtonItem;
+    ButtonItem* nextItem;
+	HANDLE  hContact;
+	TWindowData *dat;
+};
 
 typedef struct _tagButtonSet {
     ButtonItem  *items;
     LONG        left, top, right, bottom;               // client area offsets, calculated from button layout
 } ButtonSet;
 
-typedef struct {
-    char szName[40];
+struct CSkinItem {
+    TCHAR szName[40];
     char szDBname[40];
     int statusID;
 
@@ -77,28 +65,12 @@ typedef struct {
     int MARGIN_BOTTOM;
     BYTE IGNORED;
     DWORD BORDERSTYLE;
-    ImageItem *imageItem;
-} StatusItems_t;
-
-typedef struct {
-    BOOL bGRADIENT;
-    BOOL bCORNER;
-    BOOL bCOLOR;
-    BOOL bCOLOR2;
-    BOOL bCOLOR2_TRANSPARENT;
-    BOOL bTEXTCOLOR;
-    BOOL bALPHA;
-    BOOL bMARGIN_LEFT;
-    BOOL bMARGIN_TOP;
-    BOOL bMARGIN_RIGHT;
-    BOOL bMARGIN_BOTTOM;
-    BOOL bIGNORED;
-    BOOL bBORDERSTYLE;
-} ChangedSItems_t;
+    CImageItem *imageItem;
+};
 
 typedef struct _tagSkinDescription {
     DWORD           cbSize;
-    StatusItems_t   *StatusItems;
+    CSkinItem   *StatusItems;
     int             lastItem;
     int             firstItem;
     char            szModule[100];
@@ -124,6 +96,7 @@ typedef struct _tagSkinDescription {
 #define CORNER_TR 4
 #define CORNER_BR 8
 #define CORNER_BL 16
+#define CORNER_ALL (CORNER_TL | CORNER_TR | CORNER_BR | CORNER_BL | CORNER_ACTIVE)
 
 #define GRADIENT_NONE 0
 #define GRADIENT_ACTIVE 1
diff --git a/plugins/json/JSONOptions.h b/plugins/JSON/JSONOptions.h
index 3c5bb8168f..3c5bb8168f 100644
--- a/plugins/json/JSONOptions.h
+++ b/plugins/JSON/JSONOptions.h
diff --git a/plugins/json/Source/JSONChildren.cpp b/plugins/JSON/Source/JSONChildren.cpp
index 9f9e53ee81..9f9e53ee81 100644
--- a/plugins/json/Source/JSONChildren.cpp
+++ b/plugins/JSON/Source/JSONChildren.cpp
diff --git a/plugins/json/Source/JSONChildren.h b/plugins/JSON/Source/JSONChildren.h
index acc9a712a2..acc9a712a2 100644
--- a/plugins/json/Source/JSONChildren.h
+++ b/plugins/JSON/Source/JSONChildren.h
diff --git a/plugins/json/Source/JSONDebug.cpp b/plugins/JSON/Source/JSONDebug.cpp
index 3061fff616..3061fff616 100644
--- a/plugins/json/Source/JSONDebug.cpp
+++ b/plugins/JSON/Source/JSONDebug.cpp
diff --git a/plugins/json/Source/JSONDebug.h b/plugins/JSON/Source/JSONDebug.h
index cace9b5c8e..cace9b5c8e 100644
--- a/plugins/json/Source/JSONDebug.h
+++ b/plugins/JSON/Source/JSONDebug.h
diff --git a/plugins/json/Source/JSONDefs.h b/plugins/JSON/Source/JSONDefs.h
index 3cc6a3be35..3cc6a3be35 100644
--- a/plugins/json/Source/JSONDefs.h
+++ b/plugins/JSON/Source/JSONDefs.h
diff --git a/plugins/json/Source/JSONIterators.cpp b/plugins/JSON/Source/JSONIterators.cpp
index 5b140d9b17..5b140d9b17 100644
--- a/plugins/json/Source/JSONIterators.cpp
+++ b/plugins/JSON/Source/JSONIterators.cpp
diff --git a/plugins/json/Source/JSONMemory.cpp b/plugins/JSON/Source/JSONMemory.cpp
index e0181e019a..e0181e019a 100644
--- a/plugins/json/Source/JSONMemory.cpp
+++ b/plugins/JSON/Source/JSONMemory.cpp
diff --git a/plugins/json/Source/JSONMemory.h b/plugins/JSON/Source/JSONMemory.h
index 4797bd619f..4797bd619f 100644
--- a/plugins/json/Source/JSONMemory.h
+++ b/plugins/JSON/Source/JSONMemory.h
diff --git a/plugins/json/Source/JSONNode.cpp b/plugins/JSON/Source/JSONNode.cpp
index f4ced9a478..f4ced9a478 100644
--- a/plugins/json/Source/JSONNode.cpp
+++ b/plugins/JSON/Source/JSONNode.cpp
diff --git a/plugins/json/Source/JSONNode.h b/plugins/JSON/Source/JSONNode.h
index b4fad7573c..b4fad7573c 100644
--- a/plugins/json/Source/JSONNode.h
+++ b/plugins/JSON/Source/JSONNode.h
diff --git a/plugins/json/Source/JSONNode_Mutex.cpp b/plugins/JSON/Source/JSONNode_Mutex.cpp
index 0f0dbe5d7b..0f0dbe5d7b 100644
--- a/plugins/json/Source/JSONNode_Mutex.cpp
+++ b/plugins/JSON/Source/JSONNode_Mutex.cpp
diff --git a/plugins/json/Source/JSONWorker.cpp b/plugins/JSON/Source/JSONWorker.cpp
index 093d9a75b2..093d9a75b2 100644
--- a/plugins/json/Source/JSONWorker.cpp
+++ b/plugins/JSON/Source/JSONWorker.cpp
diff --git a/plugins/json/Source/JSONWorker.h b/plugins/JSON/Source/JSONWorker.h
index 373660743c..373660743c 100644
--- a/plugins/json/Source/JSONWorker.h
+++ b/plugins/JSON/Source/JSONWorker.h
diff --git a/plugins/json/Source/JSONWriter.cpp b/plugins/JSON/Source/JSONWriter.cpp
index 9b53689002..9b53689002 100644
--- a/plugins/json/Source/JSONWriter.cpp
+++ b/plugins/JSON/Source/JSONWriter.cpp
diff --git a/plugins/json/Source/JSON_Base64.cpp b/plugins/JSON/Source/JSON_Base64.cpp
index fcde330b1a..fcde330b1a 100644
--- a/plugins/json/Source/JSON_Base64.cpp
+++ b/plugins/JSON/Source/JSON_Base64.cpp
diff --git a/plugins/json/Source/JSON_Base64.h b/plugins/JSON/Source/JSON_Base64.h
index 1e2d76baa8..1e2d76baa8 100644
--- a/plugins/json/Source/JSON_Base64.h
+++ b/plugins/JSON/Source/JSON_Base64.h
diff --git a/plugins/json/Source/NumberToString.h b/plugins/JSON/Source/NumberToString.h
index a1ea2d4d3c..a1ea2d4d3c 100644
--- a/plugins/json/Source/NumberToString.h
+++ b/plugins/JSON/Source/NumberToString.h
diff --git a/plugins/json/Source/internalJSONNode.cpp b/plugins/JSON/Source/internalJSONNode.cpp
index 2651394a8a..2651394a8a 100644
--- a/plugins/json/Source/internalJSONNode.cpp
+++ b/plugins/JSON/Source/internalJSONNode.cpp
diff --git a/plugins/json/Source/internalJSONNode.h b/plugins/JSON/Source/internalJSONNode.h
index 8667e3fbbb..8667e3fbbb 100644
--- a/plugins/json/Source/internalJSONNode.h
+++ b/plugins/JSON/Source/internalJSONNode.h
diff --git a/plugins/json/Source/libJSON.cpp b/plugins/JSON/Source/libJSON.cpp
index 5671f9c0ec..5671f9c0ec 100644
--- a/plugins/json/Source/libJSON.cpp
+++ b/plugins/JSON/Source/libJSON.cpp
diff --git a/plugins/json/libJSON.h b/plugins/JSON/libJSON.h
index 83d37c46d7..83d37c46d7 100644
--- a/plugins/json/libJSON.h
+++ b/plugins/JSON/libJSON.h
diff --git a/plugins/JSON/libjson.sln b/plugins/JSON/libjson.sln
new file mode 100644
index 0000000000..8720dc7064
--- /dev/null
+++ b/plugins/JSON/libjson.sln
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjson", "libjson.vcxproj", "{F6B2FB04-4FFD-419F-BC9F-8CC43F00C2B0}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{F6B2FB04-4FFD-419F-BC9F-8CC43F00C2B0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F6B2FB04-4FFD-419F-BC9F-8CC43F00C2B0}.Debug|Win32.Build.0 = Debug|Win32
+		{F6B2FB04-4FFD-419F-BC9F-8CC43F00C2B0}.Release|Win32.ActiveCfg = Release|Win32
+		{F6B2FB04-4FFD-419F-BC9F-8CC43F00C2B0}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/plugins/json/libjson.vcxproj b/plugins/JSON/libjson.vcxproj
index 9d86cf6aa2..4e2515547b 100644
--- a/plugins/json/libjson.vcxproj
+++ b/plugins/JSON/libjson.vcxproj
@@ -14,6 +14,7 @@
     <ProjectGuid>{F6B2FB04-4FFD-419F-BC9F-8CC43F00C2B0}</ProjectGuid>
     <RootNamespace>libjson</RootNamespace>
     <Keyword>Win32Proj</Keyword>
+    <ProjectName>libJSON</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -58,7 +59,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -76,7 +77,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>
       </DebugInformationFormat>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <Optimization>Full</Optimization>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <StringPooling>true</StringPooling>
diff --git a/plugins/json/libjson.vcxproj.filters b/plugins/JSON/libjson.vcxproj.filters
index b3b9378a48..b3b9378a48 100644
--- a/plugins/json/libjson.vcxproj.filters
+++ b/plugins/JSON/libjson.vcxproj.filters
diff --git a/plugins/json/miminterface.cpp b/plugins/JSON/miminterface.cpp
index 30ccb9a69c..30ccb9a69c 100644
--- a/plugins/json/miminterface.cpp
+++ b/plugins/JSON/miminterface.cpp
diff --git a/plugins/json/miminterface.h b/plugins/JSON/miminterface.h
index e69de29bb2..e69de29bb2 100644
--- a/plugins/json/miminterface.h
+++ b/plugins/JSON/miminterface.h
diff --git a/plugins/Mwclist/commonheaders.h b/plugins/Mwclist/commonheaders.h
index 0cf472a6b1..e8333401b2 100644
--- a/plugins/Mwclist/commonheaders.h
+++ b/plugins/Mwclist/commonheaders.h
@@ -59,7 +59,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_plugins.h>
 #include "m_genmenu.h"
 #include "m_clui.h"
-#include "m_mwclc.h"
 #include "clc.h"
 #include "clist.h"
 #include "m_icolib.h"
diff --git a/plugins/Srmm/Docs/srmm-license.txt b/plugins/SRMM/Docs/srmm-license.txt
index ca3fe8d547..ca3fe8d547 100644
--- a/plugins/Srmm/Docs/srmm-license.txt
+++ b/plugins/SRMM/Docs/srmm-license.txt
diff --git a/plugins/Srmm/Docs/srmm-readme.txt b/plugins/SRMM/Docs/srmm-readme.txt
index d53888eb88..d53888eb88 100644
--- a/plugins/Srmm/Docs/srmm-readme.txt
+++ b/plugins/SRMM/Docs/srmm-readme.txt
diff --git a/plugins/Srmm/Docs/srmm-translation.txt b/plugins/SRMM/Docs/srmm-translation.txt
index 782bb9dcda..782bb9dcda 100644
--- a/plugins/Srmm/Docs/srmm-translation.txt
+++ b/plugins/SRMM/Docs/srmm-translation.txt
diff --git a/plugins/Srmm/cmdlist.c b/plugins/SRMM/cmdlist.c
index 88b1055ca2..88b1055ca2 100644
--- a/plugins/Srmm/cmdlist.c
+++ b/plugins/SRMM/cmdlist.c
diff --git a/plugins/Srmm/cmdlist.h b/plugins/SRMM/cmdlist.h
index add3d4987b..add3d4987b 100644
--- a/plugins/Srmm/cmdlist.h
+++ b/plugins/SRMM/cmdlist.h
diff --git a/plugins/Srmm/commonheaders.h b/plugins/SRMM/commonheaders.h
index fec878afd7..fec878afd7 100644
--- a/plugins/Srmm/commonheaders.h
+++ b/plugins/SRMM/commonheaders.h
diff --git a/plugins/Srmm/globals.c b/plugins/SRMM/globals.c
index 11e7606158..11e7606158 100644
--- a/plugins/Srmm/globals.c
+++ b/plugins/SRMM/globals.c
diff --git a/plugins/Srmm/globals.h b/plugins/SRMM/globals.h
index 05ae138f7d..05ae138f7d 100644
--- a/plugins/Srmm/globals.h
+++ b/plugins/SRMM/globals.h
diff --git a/plugins/Srmm/msgdialog.c b/plugins/SRMM/msgdialog.c
index 1a90a861c6..1a90a861c6 100644
--- a/plugins/Srmm/msgdialog.c
+++ b/plugins/SRMM/msgdialog.c
diff --git a/plugins/Srmm/msglog.c b/plugins/SRMM/msglog.c
index 00a8b682e4..00a8b682e4 100644
--- a/plugins/Srmm/msglog.c
+++ b/plugins/SRMM/msglog.c
diff --git a/plugins/Srmm/msgoptions.c b/plugins/SRMM/msgoptions.c
index 0cdfca4562..0cdfca4562 100644
--- a/plugins/Srmm/msgoptions.c
+++ b/plugins/SRMM/msgoptions.c
diff --git a/plugins/Srmm/msgs.c b/plugins/SRMM/msgs.c
index bfba1b6299..bfba1b6299 100644
--- a/plugins/Srmm/msgs.c
+++ b/plugins/SRMM/msgs.c
diff --git a/plugins/Srmm/msgs.h b/plugins/SRMM/msgs.h
index 842b291a08..842b291a08 100644
--- a/plugins/Srmm/msgs.h
+++ b/plugins/SRMM/msgs.h
diff --git a/plugins/Srmm/msgtimedout.c b/plugins/SRMM/msgtimedout.c
index 1b1773aa8e..1b1773aa8e 100644
--- a/plugins/Srmm/msgtimedout.c
+++ b/plugins/SRMM/msgtimedout.c
diff --git a/plugins/Srmm/res/dragcopy.cur b/plugins/SRMM/res/dragcopy.cur
index 89c7c960d5..89c7c960d5 100644
--- a/plugins/Srmm/res/dragcopy.cur
+++ b/plugins/SRMM/res/dragcopy.cur
diff --git a/plugins/Srmm/res/dropuser.cur b/plugins/SRMM/res/dropuser.cur
index a84b19e28b..a84b19e28b 100644
--- a/plugins/Srmm/res/dropuser.cur
+++ b/plugins/SRMM/res/dropuser.cur
diff --git a/plugins/Srmm/res/hyperlin.cur b/plugins/SRMM/res/hyperlin.cur
index f0f548c828..f0f548c828 100644
--- a/plugins/Srmm/res/hyperlin.cur
+++ b/plugins/SRMM/res/hyperlin.cur
diff --git a/plugins/Srmm/res/incoming.ico b/plugins/SRMM/res/incoming.ico
index fabbf979cc..fabbf979cc 100644
--- a/plugins/Srmm/res/incoming.ico
+++ b/plugins/SRMM/res/incoming.ico
diff --git a/plugins/Srmm/res/notice.ico b/plugins/SRMM/res/notice.ico
index 23527a94d8..23527a94d8 100644
--- a/plugins/Srmm/res/notice.ico
+++ b/plugins/SRMM/res/notice.ico
diff --git a/plugins/Srmm/res/outgoing.ico b/plugins/SRMM/res/outgoing.ico
index f772ab3f8d..f772ab3f8d 100644
--- a/plugins/Srmm/res/outgoing.ico
+++ b/plugins/SRMM/res/outgoing.ico
diff --git a/plugins/Srmm/resource.h b/plugins/SRMM/resource.h
index 715d83656b..715d83656b 100644
--- a/plugins/Srmm/resource.h
+++ b/plugins/SRMM/resource.h
diff --git a/plugins/Srmm/resource.rc b/plugins/SRMM/resource.rc
index fbcfe77156..fbcfe77156 100644
--- a/plugins/Srmm/resource.rc
+++ b/plugins/SRMM/resource.rc
diff --git a/plugins/Srmm/richutil.c b/plugins/SRMM/richutil.c
index 14296717f7..14296717f7 100644
--- a/plugins/Srmm/richutil.c
+++ b/plugins/SRMM/richutil.c
diff --git a/plugins/Srmm/richutil.h b/plugins/SRMM/richutil.h
index 68e9f37c5b..68e9f37c5b 100644
--- a/plugins/Srmm/richutil.h
+++ b/plugins/SRMM/richutil.h
diff --git a/plugins/Srmm/srmm.c b/plugins/SRMM/srmm.c
index a8e3949040..a8e3949040 100644
--- a/plugins/Srmm/srmm.c
+++ b/plugins/SRMM/srmm.c
diff --git a/plugins/Srmm/srmm_10.vcxproj b/plugins/SRMM/srmm_10.vcxproj
index fc87e7d352..fc87e7d352 100644
--- a/plugins/Srmm/srmm_10.vcxproj
+++ b/plugins/SRMM/srmm_10.vcxproj
diff --git a/plugins/Srmm/srmm_10.vcxproj.filters b/plugins/SRMM/srmm_10.vcxproj.filters
index 30f6186a20..30f6186a20 100644
--- a/plugins/Srmm/srmm_10.vcxproj.filters
+++ b/plugins/SRMM/srmm_10.vcxproj.filters
diff --git a/plugins/Srmm/statusicon.c b/plugins/SRMM/statusicon.c
index d8c5a5d87a..d8c5a5d87a 100644
--- a/plugins/Srmm/statusicon.c
+++ b/plugins/SRMM/statusicon.c
diff --git a/plugins/Srmm/statusicon.h b/plugins/SRMM/statusicon.h
index 314ac9ec1e..314ac9ec1e 100644
--- a/plugins/Srmm/statusicon.h
+++ b/plugins/SRMM/statusicon.h
diff --git a/plugins/Srmm/version.h b/plugins/SRMM/version.h
index 58f9cf348c..58f9cf348c 100644
--- a/plugins/Srmm/version.h
+++ b/plugins/SRMM/version.h
diff --git a/plugins/SpellChecker/spellchecker.vcxproj b/plugins/SpellChecker/spellchecker.vcxproj
index a82e1d2b2f..cb3527cbd8 100644
--- a/plugins/SpellChecker/spellchecker.vcxproj
+++ b/plugins/SpellChecker/spellchecker.vcxproj
@@ -126,8 +126,8 @@
       <AdditionalOptions>/ALIGN:4096 /filealign:0x200 /ignore:4108  %(AdditionalOptions)</AdditionalOptions>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>.\Unicode_Release/spellcheckerW.map</MapFileName>
+      <MapFileName>
+      </MapFileName>
       <BaseAddress>0x3EC20000</BaseAddress>
       <TargetMachine>MachineX86</TargetMachine>
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
@@ -172,8 +172,8 @@
       <AdditionalOptions>/ALIGN:4096 /filealign:0x200 /ignore:4108  %(AdditionalOptions)</AdditionalOptions>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>.\Release64/spellchecker64.map</MapFileName>
+      <MapFileName>
+      </MapFileName>
       <BaseAddress>0x3EC20000</BaseAddress>
       <TargetMachine>MachineX64</TargetMachine>
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
diff --git a/plugins/Tabsrmm/.cproject b/plugins/TabSRMM/.cproject
index 49f52d176f..49f52d176f 100644
--- a/plugins/Tabsrmm/.cproject
+++ b/plugins/TabSRMM/.cproject
diff --git a/plugins/Tabsrmm/.project b/plugins/TabSRMM/.project
index 9bbc96288f..9bbc96288f 100644
--- a/plugins/Tabsrmm/.project
+++ b/plugins/TabSRMM/.project
diff --git a/plugins/Tabsrmm/BuildScripts/VS_2010_Toolset9.bat b/plugins/TabSRMM/BuildScripts/VS_2010_Toolset9.bat
index cad0559f2f..cad0559f2f 100644
--- a/plugins/Tabsrmm/BuildScripts/VS_2010_Toolset9.bat
+++ b/plugins/TabSRMM/BuildScripts/VS_2010_Toolset9.bat
diff --git a/plugins/Tabsrmm/BuildScripts/Visual b/plugins/TabSRMM/BuildScripts/Visual
index 41bc5aeb8d..41bc5aeb8d 100644
--- a/plugins/Tabsrmm/BuildScripts/Visual
+++ b/plugins/TabSRMM/BuildScripts/Visual
diff --git a/plugins/Tabsrmm/DEPRECATED/tabSRMM.sln b/plugins/TabSRMM/DEPRECATED/tabSRMM.sln
index 3404e993ff..3404e993ff 100644
--- a/plugins/Tabsrmm/DEPRECATED/tabSRMM.sln
+++ b/plugins/TabSRMM/DEPRECATED/tabSRMM.sln
diff --git a/plugins/Tabsrmm/DEPRECATED/tabsrmm.vcproj b/plugins/TabSRMM/DEPRECATED/tabsrmm.vcproj
index fe38e13978..fe38e13978 100644
--- a/plugins/Tabsrmm/DEPRECATED/tabsrmm.vcproj
+++ b/plugins/TabSRMM/DEPRECATED/tabsrmm.vcproj
diff --git a/plugins/Tabsrmm/DEPRECATED/tabsrmm_9.sln b/plugins/TabSRMM/DEPRECATED/tabsrmm_9.sln
index fe00cca356..fe00cca356 100644
--- a/plugins/Tabsrmm/DEPRECATED/tabsrmm_9.sln
+++ b/plugins/TabSRMM/DEPRECATED/tabsrmm_9.sln
diff --git a/plugins/Tabsrmm/Makefile b/plugins/TabSRMM/Makefile
index 5ab409d0a5..5ab409d0a5 100644
--- a/plugins/Tabsrmm/Makefile
+++ b/plugins/TabSRMM/Makefile
diff --git a/plugins/Tabsrmm/chat/Icons/1.ico b/plugins/TabSRMM/chat/Icons/1.ico
index 2c7324149c..2c7324149c 100644
--- a/plugins/Tabsrmm/chat/Icons/1.ico
+++ b/plugins/TabSRMM/chat/Icons/1.ico
diff --git a/plugins/Tabsrmm/chat/Icons/2.ico b/plugins/TabSRMM/chat/Icons/2.ico
index f212c16855..f212c16855 100644
--- a/plugins/Tabsrmm/chat/Icons/2.ico
+++ b/plugins/TabSRMM/chat/Icons/2.ico
diff --git a/plugins/Tabsrmm/chat/Icons/3.ico b/plugins/TabSRMM/chat/Icons/3.ico
index 680cfd63e1..680cfd63e1 100644
--- a/plugins/Tabsrmm/chat/Icons/3.ico
+++ b/plugins/TabSRMM/chat/Icons/3.ico
diff --git a/plugins/Tabsrmm/chat/Icons/4.ico b/plugins/TabSRMM/chat/Icons/4.ico
index d39ae9ea76..d39ae9ea76 100644
--- a/plugins/Tabsrmm/chat/Icons/4.ico
+++ b/plugins/TabSRMM/chat/Icons/4.ico
diff --git a/plugins/Tabsrmm/chat/Icons/5.ico b/plugins/TabSRMM/chat/Icons/5.ico
index a7186bed69..a7186bed69 100644
--- a/plugins/Tabsrmm/chat/Icons/5.ico
+++ b/plugins/TabSRMM/chat/Icons/5.ico
diff --git a/plugins/Tabsrmm/chat/Icons/6.ico b/plugins/TabSRMM/chat/Icons/6.ico
index 550c72285e..550c72285e 100644
--- a/plugins/Tabsrmm/chat/Icons/6.ico
+++ b/plugins/TabSRMM/chat/Icons/6.ico
diff --git a/plugins/Tabsrmm/chat/Icons/NOVA/1.ico b/plugins/TabSRMM/chat/Icons/NOVA/1.ico
index 51dcdc4648..51dcdc4648 100644
--- a/plugins/Tabsrmm/chat/Icons/NOVA/1.ico
+++ b/plugins/TabSRMM/chat/Icons/NOVA/1.ico
diff --git a/plugins/Tabsrmm/chat/Icons/NOVA/2.ico b/plugins/TabSRMM/chat/Icons/NOVA/2.ico
index 819ecc1d7a..819ecc1d7a 100644
--- a/plugins/Tabsrmm/chat/Icons/NOVA/2.ico
+++ b/plugins/TabSRMM/chat/Icons/NOVA/2.ico
diff --git a/plugins/Tabsrmm/chat/Icons/NOVA/3.ico b/plugins/TabSRMM/chat/Icons/NOVA/3.ico
index 0928e257fe..0928e257fe 100644
--- a/plugins/Tabsrmm/chat/Icons/NOVA/3.ico
+++ b/plugins/TabSRMM/chat/Icons/NOVA/3.ico
diff --git a/plugins/Tabsrmm/chat/Icons/NOVA/4.ico b/plugins/TabSRMM/chat/Icons/NOVA/4.ico
index 5dcea114fa..5dcea114fa 100644
--- a/plugins/Tabsrmm/chat/Icons/NOVA/4.ico
+++ b/plugins/TabSRMM/chat/Icons/NOVA/4.ico
diff --git a/plugins/Tabsrmm/chat/Icons/NOVA/5.ico b/plugins/TabSRMM/chat/Icons/NOVA/5.ico
index 6aa5806c53..6aa5806c53 100644
--- a/plugins/Tabsrmm/chat/Icons/NOVA/5.ico
+++ b/plugins/TabSRMM/chat/Icons/NOVA/5.ico
diff --git a/plugins/Tabsrmm/chat/Icons/NOVA/6.ico b/plugins/TabSRMM/chat/Icons/NOVA/6.ico
index c35cc39ebc..c35cc39ebc 100644
--- a/plugins/Tabsrmm/chat/Icons/NOVA/6.ico
+++ b/plugins/TabSRMM/chat/Icons/NOVA/6.ico
diff --git a/plugins/Tabsrmm/chat/Icons/NOVA/Bkgcolor.ico b/plugins/TabSRMM/chat/Icons/NOVA/Bkgcolor.ico
index e3322ef34b..e3322ef34b 100644
--- a/plugins/Tabsrmm/chat/Icons/NOVA/Bkgcolor.ico
+++ b/plugins/TabSRMM/chat/Icons/NOVA/Bkgcolor.ico
diff --git a/plugins/Tabsrmm/chat/Icons/NOVA/action.ico b/plugins/TabSRMM/chat/Icons/NOVA/action.ico
index 44816c42d7..44816c42d7 100644
--- a/plugins/Tabsrmm/chat/Icons/NOVA/action.ico
+++ b/plugins/TabSRMM/chat/Icons/NOVA/action.ico
diff --git a/plugins/Tabsrmm/chat/Icons/NOVA/addmode.ico b/plugins/TabSRMM/chat/Icons/NOVA/addmode.ico
index a6a7e6f38c..a6a7e6f38c 100644
--- a/plugins/Tabsrmm/chat/Icons/NOVA/addmode.ico
+++ b/plugins/TabSRMM/chat/Icons/NOVA/addmode.ico
diff --git a/plugins/Tabsrmm/chat/Icons/NOVA/blank.ico b/plugins/TabSRMM/chat/Icons/NOVA/blank.ico
index 7845f62fed..7845f62fed 100644
--- a/plugins/Tabsrmm/chat/Icons/NOVA/blank.ico
+++ b/plugins/TabSRMM/chat/Icons/NOVA/blank.ico
diff --git a/plugins/Tabsrmm/chat/Icons/NOVA/filter.ico b/plugins/TabSRMM/chat/Icons/NOVA/filter.ico
index 7c99edb58c..7c99edb58c 100644
--- a/plugins/Tabsrmm/chat/Icons/NOVA/filter.ico
+++ b/plugins/TabSRMM/chat/Icons/NOVA/filter.ico
diff --git a/plugins/Tabsrmm/chat/Icons/NOVA/filter2.ico b/plugins/TabSRMM/chat/Icons/NOVA/filter2.ico
index 701890522b..701890522b 100644
--- a/plugins/Tabsrmm/chat/Icons/NOVA/filter2.ico
+++ b/plugins/TabSRMM/chat/Icons/NOVA/filter2.ico
diff --git a/plugins/Tabsrmm/chat/Icons/NOVA/highlight.ico b/plugins/TabSRMM/chat/Icons/NOVA/highlight.ico
index 552c912eaa..552c912eaa 100644
--- a/plugins/Tabsrmm/chat/Icons/NOVA/highlight.ico
+++ b/plugins/TabSRMM/chat/Icons/NOVA/highlight.ico
diff --git a/plugins/Tabsrmm/chat/Icons/NOVA/history.ico b/plugins/TabSRMM/chat/Icons/NOVA/history.ico
index 537c9b52c5..537c9b52c5 100644
--- a/plugins/Tabsrmm/chat/Icons/NOVA/history.ico
+++ b/plugins/TabSRMM/chat/Icons/NOVA/history.ico
diff --git a/plugins/Tabsrmm/chat/Icons/NOVA/info.ico b/plugins/TabSRMM/chat/Icons/NOVA/info.ico
index 1acdb7190b..1acdb7190b 100644
--- a/plugins/Tabsrmm/chat/Icons/NOVA/info.ico
+++ b/plugins/TabSRMM/chat/Icons/NOVA/info.ico
diff --git a/plugins/Tabsrmm/chat/Icons/NOVA/join.ico b/plugins/TabSRMM/chat/Icons/NOVA/join.ico
index 151cd93211..151cd93211 100644
--- a/plugins/Tabsrmm/chat/Icons/NOVA/join.ico
+++ b/plugins/TabSRMM/chat/Icons/NOVA/join.ico
diff --git a/plugins/Tabsrmm/chat/Icons/NOVA/kick.ico b/plugins/TabSRMM/chat/Icons/NOVA/kick.ico
index c93e92dd77..c93e92dd77 100644
--- a/plugins/Tabsrmm/chat/Icons/NOVA/kick.ico
+++ b/plugins/TabSRMM/chat/Icons/NOVA/kick.ico
diff --git a/plugins/Tabsrmm/chat/Icons/NOVA/message.ico b/plugins/TabSRMM/chat/Icons/NOVA/message.ico
index 19957e4ac8..19957e4ac8 100644
--- a/plugins/Tabsrmm/chat/Icons/NOVA/message.ico
+++ b/plugins/TabSRMM/chat/Icons/NOVA/message.ico
diff --git a/plugins/Tabsrmm/chat/Icons/NOVA/messageout.ico b/plugins/TabSRMM/chat/Icons/NOVA/messageout.ico
index 637196b745..637196b745 100644
--- a/plugins/Tabsrmm/chat/Icons/NOVA/messageout.ico
+++ b/plugins/TabSRMM/chat/Icons/NOVA/messageout.ico
diff --git a/plugins/Tabsrmm/chat/Icons/NOVA/nick.ico b/plugins/TabSRMM/chat/Icons/NOVA/nick.ico
index 3f199ffd50..3f199ffd50 100644
--- a/plugins/Tabsrmm/chat/Icons/NOVA/nick.ico
+++ b/plugins/TabSRMM/chat/Icons/NOVA/nick.ico
diff --git a/plugins/Tabsrmm/chat/Icons/NOVA/nicklist_hide.ico b/plugins/TabSRMM/chat/Icons/NOVA/nicklist_hide.ico
index f2f611d6a4..f2f611d6a4 100644
--- a/plugins/Tabsrmm/chat/Icons/NOVA/nicklist_hide.ico
+++ b/plugins/TabSRMM/chat/Icons/NOVA/nicklist_hide.ico
diff --git a/plugins/Tabsrmm/chat/Icons/NOVA/nicklist_show.ico b/plugins/TabSRMM/chat/Icons/NOVA/nicklist_show.ico
index cba204fe5e..cba204fe5e 100644
--- a/plugins/Tabsrmm/chat/Icons/NOVA/nicklist_show.ico
+++ b/plugins/TabSRMM/chat/Icons/NOVA/nicklist_show.ico
diff --git a/plugins/Tabsrmm/chat/Icons/NOVA/notice.ico b/plugins/TabSRMM/chat/Icons/NOVA/notice.ico
index 1ba34d7244..1ba34d7244 100644
--- a/plugins/Tabsrmm/chat/Icons/NOVA/notice.ico
+++ b/plugins/TabSRMM/chat/Icons/NOVA/notice.ico
diff --git a/plugins/Tabsrmm/chat/Icons/NOVA/overlay.ico b/plugins/TabSRMM/chat/Icons/NOVA/overlay.ico
index 28742d898d..28742d898d 100644
--- a/plugins/Tabsrmm/chat/Icons/NOVA/overlay.ico
+++ b/plugins/TabSRMM/chat/Icons/NOVA/overlay.ico
diff --git a/plugins/Tabsrmm/chat/Icons/NOVA/part.ico b/plugins/TabSRMM/chat/Icons/NOVA/part.ico
index 39c24868aa..39c24868aa 100644
--- a/plugins/Tabsrmm/chat/Icons/NOVA/part.ico
+++ b/plugins/TabSRMM/chat/Icons/NOVA/part.ico
diff --git a/plugins/Tabsrmm/chat/Icons/NOVA/quit.ico b/plugins/TabSRMM/chat/Icons/NOVA/quit.ico
index d7fbdaf4b7..d7fbdaf4b7 100644
--- a/plugins/Tabsrmm/chat/Icons/NOVA/quit.ico
+++ b/plugins/TabSRMM/chat/Icons/NOVA/quit.ico
diff --git a/plugins/Tabsrmm/chat/Icons/NOVA/removestatus.ico b/plugins/TabSRMM/chat/Icons/NOVA/removestatus.ico
index ea3cef3fef..ea3cef3fef 100644
--- a/plugins/Tabsrmm/chat/Icons/NOVA/removestatus.ico
+++ b/plugins/TabSRMM/chat/Icons/NOVA/removestatus.ico
diff --git a/plugins/Tabsrmm/chat/Icons/NOVA/tag1.ico b/plugins/TabSRMM/chat/Icons/NOVA/tag1.ico
index 1dc687becd..1dc687becd 100644
--- a/plugins/Tabsrmm/chat/Icons/NOVA/tag1.ico
+++ b/plugins/TabSRMM/chat/Icons/NOVA/tag1.ico
diff --git a/plugins/Tabsrmm/chat/Icons/NOVA/tag2.ico b/plugins/TabSRMM/chat/Icons/NOVA/tag2.ico
index 4fac50a4c8..4fac50a4c8 100644
--- a/plugins/Tabsrmm/chat/Icons/NOVA/tag2.ico
+++ b/plugins/TabSRMM/chat/Icons/NOVA/tag2.ico
diff --git a/plugins/Tabsrmm/chat/Icons/NOVA/topic.ico b/plugins/TabSRMM/chat/Icons/NOVA/topic.ico
index e4bb7da7e0..e4bb7da7e0 100644
--- a/plugins/Tabsrmm/chat/Icons/NOVA/topic.ico
+++ b/plugins/TabSRMM/chat/Icons/NOVA/topic.ico
diff --git a/plugins/Tabsrmm/chat/Icons/NOVA/topicbut.ico b/plugins/TabSRMM/chat/Icons/NOVA/topicbut.ico
index ddb72fb8ca..ddb72fb8ca 100644
--- a/plugins/Tabsrmm/chat/Icons/NOVA/topicbut.ico
+++ b/plugins/TabSRMM/chat/Icons/NOVA/topicbut.ico
diff --git a/plugins/Tabsrmm/chat/Icons/NOVA/window.ico b/plugins/TabSRMM/chat/Icons/NOVA/window.ico
index 5c21ea3052..5c21ea3052 100644
--- a/plugins/Tabsrmm/chat/Icons/NOVA/window.ico
+++ b/plugins/TabSRMM/chat/Icons/NOVA/window.ico
diff --git a/plugins/Tabsrmm/chat/Icons/action.ico b/plugins/TabSRMM/chat/Icons/action.ico
index 1bccf99db6..1bccf99db6 100644
--- a/plugins/Tabsrmm/chat/Icons/action.ico
+++ b/plugins/TabSRMM/chat/Icons/action.ico
diff --git a/plugins/Tabsrmm/chat/Icons/addmode.ico b/plugins/TabSRMM/chat/Icons/addmode.ico
index 844b7c5d46..844b7c5d46 100644
--- a/plugins/Tabsrmm/chat/Icons/addmode.ico
+++ b/plugins/TabSRMM/chat/Icons/addmode.ico
diff --git a/plugins/Tabsrmm/chat/Icons/bkgcolor.ico b/plugins/TabSRMM/chat/Icons/bkgcolor.ico
index 11c54ab502..11c54ab502 100644
--- a/plugins/Tabsrmm/chat/Icons/bkgcolor.ico
+++ b/plugins/TabSRMM/chat/Icons/bkgcolor.ico
diff --git a/plugins/Tabsrmm/chat/Icons/blank.ico b/plugins/TabSRMM/chat/Icons/blank.ico
index 7845f62fed..7845f62fed 100644
--- a/plugins/Tabsrmm/chat/Icons/blank.ico
+++ b/plugins/TabSRMM/chat/Icons/blank.ico
diff --git a/plugins/Tabsrmm/chat/Icons/filter.ico b/plugins/TabSRMM/chat/Icons/filter.ico
index 02aa5455f6..02aa5455f6 100644
--- a/plugins/Tabsrmm/chat/Icons/filter.ico
+++ b/plugins/TabSRMM/chat/Icons/filter.ico
diff --git a/plugins/Tabsrmm/chat/Icons/filter2.ico b/plugins/TabSRMM/chat/Icons/filter2.ico
index 3473eb9979..3473eb9979 100644
--- a/plugins/Tabsrmm/chat/Icons/filter2.ico
+++ b/plugins/TabSRMM/chat/Icons/filter2.ico
diff --git a/plugins/Tabsrmm/chat/Icons/highlight.ico b/plugins/TabSRMM/chat/Icons/highlight.ico
index abdf6a0c2c..abdf6a0c2c 100644
--- a/plugins/Tabsrmm/chat/Icons/highlight.ico
+++ b/plugins/TabSRMM/chat/Icons/highlight.ico
diff --git a/plugins/Tabsrmm/chat/Icons/history.ico b/plugins/TabSRMM/chat/Icons/history.ico
index b2477bc7d3..b2477bc7d3 100644
--- a/plugins/Tabsrmm/chat/Icons/history.ico
+++ b/plugins/TabSRMM/chat/Icons/history.ico
diff --git a/plugins/Tabsrmm/chat/Icons/info.ico b/plugins/TabSRMM/chat/Icons/info.ico
index db229094dc..db229094dc 100644
--- a/plugins/Tabsrmm/chat/Icons/info.ico
+++ b/plugins/TabSRMM/chat/Icons/info.ico
diff --git a/plugins/Tabsrmm/chat/Icons/join.ico b/plugins/TabSRMM/chat/Icons/join.ico
index 3e062a1a95..3e062a1a95 100644
--- a/plugins/Tabsrmm/chat/Icons/join.ico
+++ b/plugins/TabSRMM/chat/Icons/join.ico
diff --git a/plugins/Tabsrmm/chat/Icons/kick.ico b/plugins/TabSRMM/chat/Icons/kick.ico
index e7de687686..e7de687686 100644
--- a/plugins/Tabsrmm/chat/Icons/kick.ico
+++ b/plugins/TabSRMM/chat/Icons/kick.ico
diff --git a/plugins/Tabsrmm/chat/Icons/message.ico b/plugins/TabSRMM/chat/Icons/message.ico
index cb543ce737..cb543ce737 100644
--- a/plugins/Tabsrmm/chat/Icons/message.ico
+++ b/plugins/TabSRMM/chat/Icons/message.ico
diff --git a/plugins/Tabsrmm/chat/Icons/messageout.ico b/plugins/TabSRMM/chat/Icons/messageout.ico
index 4376f1e756..4376f1e756 100644
--- a/plugins/Tabsrmm/chat/Icons/messageout.ico
+++ b/plugins/TabSRMM/chat/Icons/messageout.ico
diff --git a/plugins/Tabsrmm/chat/Icons/nick.ico b/plugins/TabSRMM/chat/Icons/nick.ico
index 97b681f0c7..97b681f0c7 100644
--- a/plugins/Tabsrmm/chat/Icons/nick.ico
+++ b/plugins/TabSRMM/chat/Icons/nick.ico
diff --git a/plugins/Tabsrmm/chat/Icons/nicklist_hide.ico b/plugins/TabSRMM/chat/Icons/nicklist_hide.ico
index 7abd838725..7abd838725 100644
--- a/plugins/Tabsrmm/chat/Icons/nicklist_hide.ico
+++ b/plugins/TabSRMM/chat/Icons/nicklist_hide.ico
diff --git a/plugins/Tabsrmm/chat/Icons/nicklist_show.ico b/plugins/TabSRMM/chat/Icons/nicklist_show.ico
index 9390b173b3..9390b173b3 100644
--- a/plugins/Tabsrmm/chat/Icons/nicklist_show.ico
+++ b/plugins/TabSRMM/chat/Icons/nicklist_show.ico
diff --git a/plugins/Tabsrmm/chat/Icons/notice.ico b/plugins/TabSRMM/chat/Icons/notice.ico
index 31ebb310f6..31ebb310f6 100644
--- a/plugins/Tabsrmm/chat/Icons/notice.ico
+++ b/plugins/TabSRMM/chat/Icons/notice.ico
diff --git a/plugins/Tabsrmm/chat/Icons/overlay.ico b/plugins/TabSRMM/chat/Icons/overlay.ico
index a3f7cf6c36..a3f7cf6c36 100644
--- a/plugins/Tabsrmm/chat/Icons/overlay.ico
+++ b/plugins/TabSRMM/chat/Icons/overlay.ico
diff --git a/plugins/Tabsrmm/chat/Icons/part.ico b/plugins/TabSRMM/chat/Icons/part.ico
index 1444253dee..1444253dee 100644
--- a/plugins/Tabsrmm/chat/Icons/part.ico
+++ b/plugins/TabSRMM/chat/Icons/part.ico
diff --git a/plugins/Tabsrmm/chat/Icons/quit.ico b/plugins/TabSRMM/chat/Icons/quit.ico
index 2d54d764cf..2d54d764cf 100644
--- a/plugins/Tabsrmm/chat/Icons/quit.ico
+++ b/plugins/TabSRMM/chat/Icons/quit.ico
diff --git a/plugins/Tabsrmm/chat/Icons/removestatus.ico b/plugins/TabSRMM/chat/Icons/removestatus.ico
index 7f4711e8a9..7f4711e8a9 100644
--- a/plugins/Tabsrmm/chat/Icons/removestatus.ico
+++ b/plugins/TabSRMM/chat/Icons/removestatus.ico
diff --git a/plugins/Tabsrmm/chat/Icons/tag1.ico b/plugins/TabSRMM/chat/Icons/tag1.ico
index 1dc687becd..1dc687becd 100644
--- a/plugins/Tabsrmm/chat/Icons/tag1.ico
+++ b/plugins/TabSRMM/chat/Icons/tag1.ico
diff --git a/plugins/Tabsrmm/chat/Icons/tag2.ico b/plugins/TabSRMM/chat/Icons/tag2.ico
index 4fac50a4c8..4fac50a4c8 100644
--- a/plugins/Tabsrmm/chat/Icons/tag2.ico
+++ b/plugins/TabSRMM/chat/Icons/tag2.ico
diff --git a/plugins/Tabsrmm/chat/Icons/topic.ico b/plugins/TabSRMM/chat/Icons/topic.ico
index 5c7fff78a1..5c7fff78a1 100644
--- a/plugins/Tabsrmm/chat/Icons/topic.ico
+++ b/plugins/TabSRMM/chat/Icons/topic.ico
diff --git a/plugins/Tabsrmm/chat/Icons/topicbut.ico b/plugins/TabSRMM/chat/Icons/topicbut.ico
index 48bec51143..48bec51143 100644
--- a/plugins/Tabsrmm/chat/Icons/topicbut.ico
+++ b/plugins/TabSRMM/chat/Icons/topicbut.ico
diff --git a/plugins/Tabsrmm/chat/Icons/window.ico b/plugins/TabSRMM/chat/Icons/window.ico
index d64d924548..d64d924548 100644
--- a/plugins/Tabsrmm/chat/Icons/window.ico
+++ b/plugins/TabSRMM/chat/Icons/window.ico
diff --git a/plugins/Tabsrmm/chat/chat.h b/plugins/TabSRMM/chat/chat.h
index e06634beef..e06634beef 100644
--- a/plugins/Tabsrmm/chat/chat.h
+++ b/plugins/TabSRMM/chat/chat.h
diff --git a/plugins/Tabsrmm/chat/chat.rc b/plugins/TabSRMM/chat/chat.rc
index 47c2a877fa..47c2a877fa 100644
--- a/plugins/Tabsrmm/chat/chat.rc
+++ b/plugins/TabSRMM/chat/chat.rc
diff --git a/plugins/Tabsrmm/chat/chat_resource.h b/plugins/TabSRMM/chat/chat_resource.h
index 07a9bb8ba4..07a9bb8ba4 100644
--- a/plugins/Tabsrmm/chat/chat_resource.h
+++ b/plugins/TabSRMM/chat/chat_resource.h
diff --git a/plugins/Tabsrmm/chat/chatprototypes.h b/plugins/TabSRMM/chat/chatprototypes.h
index 066a25e919..066a25e919 100644
--- a/plugins/Tabsrmm/chat/chatprototypes.h
+++ b/plugins/TabSRMM/chat/chatprototypes.h
diff --git a/plugins/Tabsrmm/chat/clist.cpp b/plugins/TabSRMM/chat/clist.cpp
index d321c4d017..d321c4d017 100644
--- a/plugins/Tabsrmm/chat/clist.cpp
+++ b/plugins/TabSRMM/chat/clist.cpp
diff --git a/plugins/Tabsrmm/chat/colorchooser.cpp b/plugins/TabSRMM/chat/colorchooser.cpp
index 4879f56d95..4879f56d95 100644
--- a/plugins/Tabsrmm/chat/colorchooser.cpp
+++ b/plugins/TabSRMM/chat/colorchooser.cpp
diff --git a/plugins/Tabsrmm/chat/log.cpp b/plugins/TabSRMM/chat/log.cpp
index 7c167441d0..7c167441d0 100644
--- a/plugins/Tabsrmm/chat/log.cpp
+++ b/plugins/TabSRMM/chat/log.cpp
diff --git a/plugins/Tabsrmm/chat/main.cpp b/plugins/TabSRMM/chat/main.cpp
index 45b0717f29..45b0717f29 100644
--- a/plugins/Tabsrmm/chat/main.cpp
+++ b/plugins/TabSRMM/chat/main.cpp
diff --git a/plugins/Tabsrmm/chat/manager.cpp b/plugins/TabSRMM/chat/manager.cpp
index 8a1e404ea5..8a1e404ea5 100644
--- a/plugins/Tabsrmm/chat/manager.cpp
+++ b/plugins/TabSRMM/chat/manager.cpp
diff --git a/plugins/Tabsrmm/chat/message.cpp b/plugins/TabSRMM/chat/message.cpp
index 0a7f56b594..0a7f56b594 100644
--- a/plugins/Tabsrmm/chat/message.cpp
+++ b/plugins/TabSRMM/chat/message.cpp
diff --git a/plugins/Tabsrmm/chat/muchighlight.cpp b/plugins/TabSRMM/chat/muchighlight.cpp
index d790cc1d2b..d790cc1d2b 100644
--- a/plugins/Tabsrmm/chat/muchighlight.cpp
+++ b/plugins/TabSRMM/chat/muchighlight.cpp
diff --git a/plugins/Tabsrmm/chat/muchighlight.h b/plugins/TabSRMM/chat/muchighlight.h
index cffac2ad39..cffac2ad39 100644
--- a/plugins/Tabsrmm/chat/muchighlight.h
+++ b/plugins/TabSRMM/chat/muchighlight.h
diff --git a/plugins/Tabsrmm/chat/options.cpp b/plugins/TabSRMM/chat/options.cpp
index e3e40db2ac..e3e40db2ac 100644
--- a/plugins/Tabsrmm/chat/options.cpp
+++ b/plugins/TabSRMM/chat/options.cpp
diff --git a/plugins/Tabsrmm/chat/services.cpp b/plugins/TabSRMM/chat/services.cpp
index e165763861..e165763861 100644
--- a/plugins/Tabsrmm/chat/services.cpp
+++ b/plugins/TabSRMM/chat/services.cpp
diff --git a/plugins/Tabsrmm/chat/tools.cpp b/plugins/TabSRMM/chat/tools.cpp
index 0726a01869..0726a01869 100644
--- a/plugins/Tabsrmm/chat/tools.cpp
+++ b/plugins/TabSRMM/chat/tools.cpp
diff --git a/plugins/Tabsrmm/chat/window.cpp b/plugins/TabSRMM/chat/window.cpp
index 0c7d3c8f99..0c7d3c8f99 100644
--- a/plugins/Tabsrmm/chat/window.cpp
+++ b/plugins/TabSRMM/chat/window.cpp
diff --git a/plugins/Tabsrmm/docs/INSTALL b/plugins/TabSRMM/docs/INSTALL
index bc4049f3df..bc4049f3df 100644
--- a/plugins/Tabsrmm/docs/INSTALL
+++ b/plugins/TabSRMM/docs/INSTALL
diff --git a/plugins/Tabsrmm/docs/MetaContacts.TXT b/plugins/TabSRMM/docs/MetaContacts.TXT
index 5afa62aa1d..5afa62aa1d 100644
--- a/plugins/Tabsrmm/docs/MetaContacts.TXT
+++ b/plugins/TabSRMM/docs/MetaContacts.TXT
diff --git a/plugins/Tabsrmm/docs/POPUPS.TXT b/plugins/TabSRMM/docs/POPUPS.TXT
index ae6aea392e..ae6aea392e 100644
--- a/plugins/Tabsrmm/docs/POPUPS.TXT
+++ b/plugins/TabSRMM/docs/POPUPS.TXT
diff --git a/plugins/Tabsrmm/docs/changelog.OLD b/plugins/TabSRMM/docs/changelog.OLD
index 0449d8840b..0449d8840b 100644
--- a/plugins/Tabsrmm/docs/changelog.OLD
+++ b/plugins/TabSRMM/docs/changelog.OLD
diff --git a/plugins/Tabsrmm/docs/changelog.txt b/plugins/TabSRMM/docs/changelog.txt
index d5d1f52406..d5d1f52406 100644
--- a/plugins/Tabsrmm/docs/changelog.txt
+++ b/plugins/TabSRMM/docs/changelog.txt
diff --git a/plugins/Tabsrmm/docs/contributors.txt b/plugins/TabSRMM/docs/contributors.txt
index 6838692cd5..6838692cd5 100644
--- a/plugins/Tabsrmm/docs/contributors.txt
+++ b/plugins/TabSRMM/docs/contributors.txt
diff --git a/plugins/Tabsrmm/docs/readme.txt b/plugins/TabSRMM/docs/readme.txt
index c1326b6b12..c1326b6b12 100644
--- a/plugins/Tabsrmm/docs/readme.txt
+++ b/plugins/TabSRMM/docs/readme.txt
diff --git a/plugins/Tabsrmm/icons/ICONSXP/.cvsignore b/plugins/TabSRMM/icons/ICONSXP/.cvsignore
index 76b025ad1f..76b025ad1f 100644
--- a/plugins/Tabsrmm/icons/ICONSXP/.cvsignore
+++ b/plugins/TabSRMM/icons/ICONSXP/.cvsignore
diff --git a/plugins/Tabsrmm/icons/ICONSXP/ICONSXP.dsp b/plugins/TabSRMM/icons/ICONSXP/ICONSXP.dsp
index ac61cb795c..ac61cb795c 100644
--- a/plugins/Tabsrmm/icons/ICONSXP/ICONSXP.dsp
+++ b/plugins/TabSRMM/icons/ICONSXP/ICONSXP.dsp
diff --git a/plugins/Tabsrmm/icons/ICONSXP/ICONSXP.mak b/plugins/TabSRMM/icons/ICONSXP/ICONSXP.mak
index 6029d6bed0..6029d6bed0 100644
--- a/plugins/Tabsrmm/icons/ICONSXP/ICONSXP.mak
+++ b/plugins/TabSRMM/icons/ICONSXP/ICONSXP.mak
diff --git a/plugins/Tabsrmm/icons/ICONSXP/ICONSXP.rc b/plugins/TabSRMM/icons/ICONSXP/ICONSXP.rc
index 1cce21c489..1cce21c489 100644
--- a/plugins/Tabsrmm/icons/ICONSXP/ICONSXP.rc
+++ b/plugins/TabSRMM/icons/ICONSXP/ICONSXP.rc
diff --git a/plugins/Tabsrmm/icons/ICONSXP/ICONSXP.vcproj b/plugins/TabSRMM/icons/ICONSXP/ICONSXP.vcproj
index 61831c008b..61831c008b 100644
--- a/plugins/Tabsrmm/icons/ICONSXP/ICONSXP.vcproj
+++ b/plugins/TabSRMM/icons/ICONSXP/ICONSXP.vcproj
diff --git a/plugins/Tabsrmm/icons/ICONSXP/iconsxp_8.sln b/plugins/TabSRMM/icons/ICONSXP/iconsxp_8.sln
index 4e91730275..4e91730275 100644
--- a/plugins/Tabsrmm/icons/ICONSXP/iconsxp_8.sln
+++ b/plugins/TabSRMM/icons/ICONSXP/iconsxp_8.sln
diff --git a/plugins/Tabsrmm/icons/ICONSXP/iconsxp_8.vcproj b/plugins/TabSRMM/icons/ICONSXP/iconsxp_8.vcproj
index a9de3892a2..a9de3892a2 100644
--- a/plugins/Tabsrmm/icons/ICONSXP/iconsxp_8.vcproj
+++ b/plugins/TabSRMM/icons/ICONSXP/iconsxp_8.vcproj
diff --git a/plugins/Tabsrmm/icons/ICONSXP/iconsxp_8.vpj b/plugins/TabSRMM/icons/ICONSXP/iconsxp_8.vpj
index 59c21d96f5..59c21d96f5 100644
--- a/plugins/Tabsrmm/icons/ICONSXP/iconsxp_8.vpj
+++ b/plugins/TabSRMM/icons/ICONSXP/iconsxp_8.vpj
diff --git a/plugins/Tabsrmm/icons/ICONSXP/iconsxp_9.vcproj b/plugins/TabSRMM/icons/ICONSXP/iconsxp_9.vcproj
index cd6b11ec61..cd6b11ec61 100644
--- a/plugins/Tabsrmm/icons/ICONSXP/iconsxp_9.vcproj
+++ b/plugins/TabSRMM/icons/ICONSXP/iconsxp_9.vcproj
diff --git a/plugins/Tabsrmm/icons/ICONSXP/resource.h b/plugins/TabSRMM/icons/ICONSXP/resource.h
index 7e9a8f06cc..7e9a8f06cc 100644
--- a/plugins/Tabsrmm/icons/ICONSXP/resource.h
+++ b/plugins/TabSRMM/icons/ICONSXP/resource.h
diff --git a/plugins/Tabsrmm/icons/ICONS_NOVA/ICONS_NOVA.dep b/plugins/TabSRMM/icons/ICONS_NOVA/ICONS_NOVA.dep
index 17150fe02e..17150fe02e 100644
--- a/plugins/Tabsrmm/icons/ICONS_NOVA/ICONS_NOVA.dep
+++ b/plugins/TabSRMM/icons/ICONS_NOVA/ICONS_NOVA.dep
diff --git a/plugins/Tabsrmm/icons/ICONS_NOVA/ICONS_NOVA.dsp b/plugins/TabSRMM/icons/ICONS_NOVA/ICONS_NOVA.dsp
index 404ea90f7a..404ea90f7a 100644
--- a/plugins/Tabsrmm/icons/ICONS_NOVA/ICONS_NOVA.dsp
+++ b/plugins/TabSRMM/icons/ICONS_NOVA/ICONS_NOVA.dsp
diff --git a/plugins/Tabsrmm/icons/ICONS_NOVA/ICONS_NOVA.dsw b/plugins/TabSRMM/icons/ICONS_NOVA/ICONS_NOVA.dsw
index 6ca6b426fb..6ca6b426fb 100644
--- a/plugins/Tabsrmm/icons/ICONS_NOVA/ICONS_NOVA.dsw
+++ b/plugins/TabSRMM/icons/ICONS_NOVA/ICONS_NOVA.dsw
diff --git a/plugins/Tabsrmm/icons/ICONS_NOVA/ICONS_NOVA.mak b/plugins/TabSRMM/icons/ICONS_NOVA/ICONS_NOVA.mak
index ca0be712c0..ca0be712c0 100644
--- a/plugins/Tabsrmm/icons/ICONS_NOVA/ICONS_NOVA.mak
+++ b/plugins/TabSRMM/icons/ICONS_NOVA/ICONS_NOVA.mak
diff --git a/plugins/Tabsrmm/icons/ICONS_NOVA/ICONS_NOVA.rc b/plugins/TabSRMM/icons/ICONS_NOVA/ICONS_NOVA.rc
index 3e78602345..3e78602345 100644
--- a/plugins/Tabsrmm/icons/ICONS_NOVA/ICONS_NOVA.rc
+++ b/plugins/TabSRMM/icons/ICONS_NOVA/ICONS_NOVA.rc
diff --git a/plugins/Tabsrmm/icons/ICONS_NOVA/ICONS_NOVA.vcproj b/plugins/TabSRMM/icons/ICONS_NOVA/ICONS_NOVA.vcproj
index 67eb2d8efe..67eb2d8efe 100644
--- a/plugins/Tabsrmm/icons/ICONS_NOVA/ICONS_NOVA.vcproj
+++ b/plugins/TabSRMM/icons/ICONS_NOVA/ICONS_NOVA.vcproj
diff --git a/plugins/Tabsrmm/icons/ICONS_NOVA/ICONS_NOVA_10.vcxproj b/plugins/TabSRMM/icons/ICONS_NOVA/ICONS_NOVA_10.vcxproj
index 7fcc7ae668..7fcc7ae668 100644
--- a/plugins/Tabsrmm/icons/ICONS_NOVA/ICONS_NOVA_10.vcxproj
+++ b/plugins/TabSRMM/icons/ICONS_NOVA/ICONS_NOVA_10.vcxproj
diff --git a/plugins/Tabsrmm/icons/ICONS_NOVA/ICONS_NOVA_10.vcxproj.filters b/plugins/TabSRMM/icons/ICONS_NOVA/ICONS_NOVA_10.vcxproj.filters
index 3eb80668f3..3eb80668f3 100644
--- a/plugins/Tabsrmm/icons/ICONS_NOVA/ICONS_NOVA_10.vcxproj.filters
+++ b/plugins/TabSRMM/icons/ICONS_NOVA/ICONS_NOVA_10.vcxproj.filters
diff --git a/plugins/Tabsrmm/include/ImageDataObject.h b/plugins/TabSRMM/include/ImageDataObject.h
index 0e2c112827..0e2c112827 100644
--- a/plugins/Tabsrmm/include/ImageDataObject.h
+++ b/plugins/TabSRMM/include/ImageDataObject.h
diff --git a/plugins/Tabsrmm/include/contactcache.h b/plugins/TabSRMM/include/contactcache.h
index 4d1543ec0d..4d1543ec0d 100644
--- a/plugins/Tabsrmm/include/contactcache.h
+++ b/plugins/TabSRMM/include/contactcache.h
diff --git a/plugins/Tabsrmm/include/controls.h b/plugins/TabSRMM/include/controls.h
index f20dbf076a..f20dbf076a 100644
--- a/plugins/Tabsrmm/include/controls.h
+++ b/plugins/TabSRMM/include/controls.h
diff --git a/plugins/Tabsrmm/include/functions.h b/plugins/TabSRMM/include/functions.h
index a08d922f01..a08d922f01 100644
--- a/plugins/Tabsrmm/include/functions.h
+++ b/plugins/TabSRMM/include/functions.h
diff --git a/plugins/Tabsrmm/include/generic_msghandlers.h b/plugins/TabSRMM/include/generic_msghandlers.h
index 2139bdbeb0..2139bdbeb0 100644
--- a/plugins/Tabsrmm/include/generic_msghandlers.h
+++ b/plugins/TabSRMM/include/generic_msghandlers.h
diff --git a/plugins/Tabsrmm/include/globals.h b/plugins/TabSRMM/include/globals.h
index f399fbe359..f399fbe359 100644
--- a/plugins/Tabsrmm/include/globals.h
+++ b/plugins/TabSRMM/include/globals.h
diff --git a/plugins/Tabsrmm/include/infopanel.h b/plugins/TabSRMM/include/infopanel.h
index 47e7345f53..47e7345f53 100644
--- a/plugins/Tabsrmm/include/infopanel.h
+++ b/plugins/TabSRMM/include/infopanel.h
diff --git a/plugins/Tabsrmm/include/mim.h b/plugins/TabSRMM/include/mim.h
index 35783b1ec2..35783b1ec2 100644
--- a/plugins/Tabsrmm/include/mim.h
+++ b/plugins/TabSRMM/include/mim.h
diff --git a/plugins/Tabsrmm/include/msgdlgutils.h b/plugins/TabSRMM/include/msgdlgutils.h
index d882e00fb0..d882e00fb0 100644
--- a/plugins/Tabsrmm/include/msgdlgutils.h
+++ b/plugins/TabSRMM/include/msgdlgutils.h
diff --git a/plugins/Tabsrmm/include/msgs.h b/plugins/TabSRMM/include/msgs.h
index 51c59a1561..51c59a1561 100644
--- a/plugins/Tabsrmm/include/msgs.h
+++ b/plugins/TabSRMM/include/msgs.h
diff --git a/plugins/Tabsrmm/include/nen.h b/plugins/TabSRMM/include/nen.h
index d3a8fa8bdd..d3a8fa8bdd 100644
--- a/plugins/Tabsrmm/include/nen.h
+++ b/plugins/TabSRMM/include/nen.h
diff --git a/plugins/Tabsrmm/include/resource.h b/plugins/TabSRMM/include/resource.h
index 0ae02e554e..0ae02e554e 100644
--- a/plugins/Tabsrmm/include/resource.h
+++ b/plugins/TabSRMM/include/resource.h
diff --git a/plugins/Tabsrmm/include/sendlater.h b/plugins/TabSRMM/include/sendlater.h
index b4ce12880f..b4ce12880f 100644
--- a/plugins/Tabsrmm/include/sendlater.h
+++ b/plugins/TabSRMM/include/sendlater.h
diff --git a/plugins/Tabsrmm/include/sendqueue.h b/plugins/TabSRMM/include/sendqueue.h
index 9914e241f8..9914e241f8 100644
--- a/plugins/Tabsrmm/include/sendqueue.h
+++ b/plugins/TabSRMM/include/sendqueue.h
diff --git a/plugins/Tabsrmm/include/sidebar.h b/plugins/TabSRMM/include/sidebar.h
index 4cc60be747..4cc60be747 100644
--- a/plugins/Tabsrmm/include/sidebar.h
+++ b/plugins/TabSRMM/include/sidebar.h
diff --git a/plugins/Tabsrmm/include/taskbar.h b/plugins/TabSRMM/include/taskbar.h
index 1b1725d48f..1b1725d48f 100644
--- a/plugins/Tabsrmm/include/taskbar.h
+++ b/plugins/TabSRMM/include/taskbar.h
diff --git a/plugins/Tabsrmm/include/templates.h b/plugins/TabSRMM/include/templates.h
index f347a68102..f347a68102 100644
--- a/plugins/Tabsrmm/include/templates.h
+++ b/plugins/TabSRMM/include/templates.h
diff --git a/plugins/Tabsrmm/include/themes.h b/plugins/TabSRMM/include/themes.h
index d1cc15d53c..d1cc15d53c 100644
--- a/plugins/Tabsrmm/include/themes.h
+++ b/plugins/TabSRMM/include/themes.h
diff --git a/plugins/Tabsrmm/include/translator.h b/plugins/TabSRMM/include/translator.h
index e248a319f8..e248a319f8 100644
--- a/plugins/Tabsrmm/include/translator.h
+++ b/plugins/TabSRMM/include/translator.h
diff --git a/plugins/Tabsrmm/include/typingnotify.h b/plugins/TabSRMM/include/typingnotify.h
index 03fb9851b7..03fb9851b7 100644
--- a/plugins/Tabsrmm/include/typingnotify.h
+++ b/plugins/TabSRMM/include/typingnotify.h
diff --git a/plugins/Tabsrmm/include/utils.h b/plugins/TabSRMM/include/utils.h
index fd101c0aca..fd101c0aca 100644
--- a/plugins/Tabsrmm/include/utils.h
+++ b/plugins/TabSRMM/include/utils.h
diff --git a/plugins/Tabsrmm/include/version.h b/plugins/TabSRMM/include/version.h
index 0ebcca8317..0ebcca8317 100644
--- a/plugins/Tabsrmm/include/version.h
+++ b/plugins/TabSRMM/include/version.h
diff --git a/plugins/Tabsrmm/msgwindow.rc b/plugins/TabSRMM/msgwindow.rc
index 2c54f0b9d3..2c54f0b9d3 100644
--- a/plugins/Tabsrmm/msgwindow.rc
+++ b/plugins/TabSRMM/msgwindow.rc
diff --git a/plugins/Tabsrmm/pack.cmd b/plugins/TabSRMM/pack.cmd
index 92d4da0cb6..92d4da0cb6 100644
--- a/plugins/Tabsrmm/pack.cmd
+++ b/plugins/TabSRMM/pack.cmd
diff --git a/plugins/Tabsrmm/res/Logo.ico b/plugins/TabSRMM/res/Logo.ico
index e777e06380..e777e06380 100644
--- a/plugins/Tabsrmm/res/Logo.ico
+++ b/plugins/TabSRMM/res/Logo.ico
diff --git a/plugins/Tabsrmm/res/NOVA/Font2.ico b/plugins/TabSRMM/res/NOVA/Font2.ico
index 0accc238f5..0accc238f5 100644
--- a/plugins/Tabsrmm/res/NOVA/Font2.ico
+++ b/plugins/TabSRMM/res/NOVA/Font2.ico
diff --git a/plugins/Tabsrmm/res/NOVA/Incom.ico b/plugins/TabSRMM/res/NOVA/Incom.ico
index 19957e4ac8..19957e4ac8 100644
--- a/plugins/Tabsrmm/res/NOVA/Incom.ico
+++ b/plugins/TabSRMM/res/NOVA/Incom.ico
diff --git a/plugins/Tabsrmm/res/NOVA/Outg.ico b/plugins/TabSRMM/res/NOVA/Outg.ico
index 637196b745..637196b745 100644
--- a/plugins/Tabsrmm/res/NOVA/Outg.ico
+++ b/plugins/TabSRMM/res/NOVA/Outg.ico
diff --git a/plugins/Tabsrmm/res/NOVA/Status change.ico b/plugins/TabSRMM/res/NOVA/Status change.ico
index 8bfe42bf39..8bfe42bf39 100644
--- a/plugins/Tabsrmm/res/NOVA/Status change.ico
+++ b/plugins/TabSRMM/res/NOVA/Status change.ico
diff --git a/plugins/Tabsrmm/res/NOVA/avatar.ico b/plugins/TabSRMM/res/NOVA/avatar.ico
index cad68be597..cad68be597 100644
--- a/plugins/Tabsrmm/res/NOVA/avatar.ico
+++ b/plugins/TabSRMM/res/NOVA/avatar.ico
diff --git a/plugins/Tabsrmm/res/NOVA/block.ico b/plugins/TabSRMM/res/NOVA/block.ico
index bdb0086c5b..bdb0086c5b 100644
--- a/plugins/Tabsrmm/res/NOVA/block.ico
+++ b/plugins/TabSRMM/res/NOVA/block.ico
diff --git a/plugins/Tabsrmm/res/NOVA/bold.ico b/plugins/TabSRMM/res/NOVA/bold.ico
index fc34113b6b..fc34113b6b 100644
--- a/plugins/Tabsrmm/res/NOVA/bold.ico
+++ b/plugins/TabSRMM/res/NOVA/bold.ico
diff --git a/plugins/Tabsrmm/res/NOVA/check.ico b/plugins/TabSRMM/res/NOVA/check.ico
index 9649501087..9649501087 100644
--- a/plugins/Tabsrmm/res/NOVA/check.ico
+++ b/plugins/TabSRMM/res/NOVA/check.ico
diff --git a/plugins/Tabsrmm/res/NOVA/clock.ico b/plugins/TabSRMM/res/NOVA/clock.ico
index 6ae180c48f..6ae180c48f 100644
--- a/plugins/Tabsrmm/res/NOVA/clock.ico
+++ b/plugins/TabSRMM/res/NOVA/clock.ico
diff --git a/plugins/Tabsrmm/res/NOVA/color.ico b/plugins/TabSRMM/res/NOVA/color.ico
index 689762edbb..689762edbb 100644
--- a/plugins/Tabsrmm/res/NOVA/color.ico
+++ b/plugins/TabSRMM/res/NOVA/color.ico
diff --git a/plugins/Tabsrmm/res/NOVA/delete.ico b/plugins/TabSRMM/res/NOVA/delete.ico
index 6e39da592b..6e39da592b 100644
--- a/plugins/Tabsrmm/res/NOVA/delete.ico
+++ b/plugins/TabSRMM/res/NOVA/delete.ico
diff --git a/plugins/Tabsrmm/res/NOVA/emoticon.ico b/plugins/TabSRMM/res/NOVA/emoticon.ico
index e0d066ce33..e0d066ce33 100644
--- a/plugins/Tabsrmm/res/NOVA/emoticon.ico
+++ b/plugins/TabSRMM/res/NOVA/emoticon.ico
diff --git a/plugins/Tabsrmm/res/NOVA/favlist.ico b/plugins/TabSRMM/res/NOVA/favlist.ico
index 9b55cd0afa..9b55cd0afa 100644
--- a/plugins/Tabsrmm/res/NOVA/favlist.ico
+++ b/plugins/TabSRMM/res/NOVA/favlist.ico
diff --git a/plugins/Tabsrmm/res/NOVA/file.ico b/plugins/TabSRMM/res/NOVA/file.ico
index fadf04c4da..fadf04c4da 100644
--- a/plugins/Tabsrmm/res/NOVA/file.ico
+++ b/plugins/TabSRMM/res/NOVA/file.ico
diff --git a/plugins/Tabsrmm/res/NOVA/font.ico b/plugins/TabSRMM/res/NOVA/font.ico
index ce8272a715..ce8272a715 100644
--- a/plugins/Tabsrmm/res/NOVA/font.ico
+++ b/plugins/TabSRMM/res/NOVA/font.ico
diff --git a/plugins/Tabsrmm/res/NOVA/history.ico b/plugins/TabSRMM/res/NOVA/history.ico
index e757b93e54..e757b93e54 100644
--- a/plugins/Tabsrmm/res/NOVA/history.ico
+++ b/plugins/TabSRMM/res/NOVA/history.ico
diff --git a/plugins/Tabsrmm/res/NOVA/icon_down_arrow.ico b/plugins/TabSRMM/res/NOVA/icon_down_arrow.ico
index 1fd67fdb0f..1fd67fdb0f 100644
--- a/plugins/Tabsrmm/res/NOVA/icon_down_arrow.ico
+++ b/plugins/TabSRMM/res/NOVA/icon_down_arrow.ico
diff --git a/plugins/Tabsrmm/res/NOVA/info.ico b/plugins/TabSRMM/res/NOVA/info.ico
index 715b7a1bec..715b7a1bec 100644
--- a/plugins/Tabsrmm/res/NOVA/info.ico
+++ b/plugins/TabSRMM/res/NOVA/info.ico
diff --git a/plugins/Tabsrmm/res/NOVA/italic.ico b/plugins/TabSRMM/res/NOVA/italic.ico
index 5c61422a71..5c61422a71 100644
--- a/plugins/Tabsrmm/res/NOVA/italic.ico
+++ b/plugins/TabSRMM/res/NOVA/italic.ico
diff --git a/plugins/Tabsrmm/res/NOVA/message.ico b/plugins/TabSRMM/res/NOVA/message.ico
index b82dc84cb4..b82dc84cb4 100644
--- a/plugins/Tabsrmm/res/NOVA/message.ico
+++ b/plugins/TabSRMM/res/NOVA/message.ico
diff --git a/plugins/Tabsrmm/res/NOVA/mtn.ico b/plugins/TabSRMM/res/NOVA/mtn.ico
index f50625f7c7..f50625f7c7 100644
--- a/plugins/Tabsrmm/res/NOVA/mtn.ico
+++ b/plugins/TabSRMM/res/NOVA/mtn.ico
diff --git a/plugins/Tabsrmm/res/NOVA/multisend.ico b/plugins/TabSRMM/res/NOVA/multisend.ico
index 8f15a489f0..8f15a489f0 100644
--- a/plugins/Tabsrmm/res/NOVA/multisend.ico
+++ b/plugins/TabSRMM/res/NOVA/multisend.ico
diff --git a/plugins/Tabsrmm/res/NOVA/nomtn.ico b/plugins/TabSRMM/res/NOVA/nomtn.ico
index 0f398a2ae6..0f398a2ae6 100644
--- a/plugins/Tabsrmm/res/NOVA/nomtn.ico
+++ b/plugins/TabSRMM/res/NOVA/nomtn.ico
diff --git a/plugins/Tabsrmm/res/NOVA/options.ico b/plugins/TabSRMM/res/NOVA/options.ico
index ddb72fb8ca..ddb72fb8ca 100644
--- a/plugins/Tabsrmm/res/NOVA/options.ico
+++ b/plugins/TabSRMM/res/NOVA/options.ico
diff --git a/plugins/Tabsrmm/res/NOVA/pencil.ico b/plugins/TabSRMM/res/NOVA/pencil.ico
index a2dcf7fd17..a2dcf7fd17 100644
--- a/plugins/Tabsrmm/res/NOVA/pencil.ico
+++ b/plugins/TabSRMM/res/NOVA/pencil.ico
diff --git a/plugins/Tabsrmm/res/NOVA/plus.ico b/plugins/TabSRMM/res/NOVA/plus.ico
index a6a7e6f38c..a6a7e6f38c 100644
--- a/plugins/Tabsrmm/res/NOVA/plus.ico
+++ b/plugins/TabSRMM/res/NOVA/plus.ico
diff --git a/plugins/Tabsrmm/res/NOVA/quote.ico b/plugins/TabSRMM/res/NOVA/quote.ico
index 7e0a596ddc..7e0a596ddc 100644
--- a/plugins/Tabsrmm/res/NOVA/quote.ico
+++ b/plugins/TabSRMM/res/NOVA/quote.ico
diff --git a/plugins/Tabsrmm/res/NOVA/recentlist.ico b/plugins/TabSRMM/res/NOVA/recentlist.ico
index 9e4c60d9d3..9e4c60d9d3 100644
--- a/plugins/Tabsrmm/res/NOVA/recentlist.ico
+++ b/plugins/TabSRMM/res/NOVA/recentlist.ico
diff --git a/plugins/Tabsrmm/res/NOVA/sbaroptions.ico b/plugins/TabSRMM/res/NOVA/sbaroptions.ico
index 0693dd7f27..0693dd7f27 100644
--- a/plugins/Tabsrmm/res/NOVA/sbaroptions.ico
+++ b/plugins/TabSRMM/res/NOVA/sbaroptions.ico
diff --git a/plugins/Tabsrmm/res/NOVA/secureOff.ico b/plugins/TabSRMM/res/NOVA/secureOff.ico
index e47cde2a31..e47cde2a31 100644
--- a/plugins/Tabsrmm/res/NOVA/secureOff.ico
+++ b/plugins/TabSRMM/res/NOVA/secureOff.ico
diff --git a/plugins/Tabsrmm/res/NOVA/secureon.ico b/plugins/TabSRMM/res/NOVA/secureon.ico
index 9db93af58c..9db93af58c 100644
--- a/plugins/Tabsrmm/res/NOVA/secureon.ico
+++ b/plugins/TabSRMM/res/NOVA/secureon.ico
diff --git a/plugins/Tabsrmm/res/NOVA/slist.ico b/plugins/TabSRMM/res/NOVA/slist.ico
index 86139d5e23..86139d5e23 100644
--- a/plugins/Tabsrmm/res/NOVA/slist.ico
+++ b/plugins/TabSRMM/res/NOVA/slist.ico
diff --git a/plugins/Tabsrmm/res/NOVA/sounds_off.ico b/plugins/TabSRMM/res/NOVA/sounds_off.ico
index a4d8f9093d..a4d8f9093d 100644
--- a/plugins/Tabsrmm/res/NOVA/sounds_off.ico
+++ b/plugins/TabSRMM/res/NOVA/sounds_off.ico
diff --git a/plugins/Tabsrmm/res/NOVA/sounds_on.ico b/plugins/TabSRMM/res/NOVA/sounds_on.ico
index f27798f6ed..f27798f6ed 100644
--- a/plugins/Tabsrmm/res/NOVA/sounds_on.ico
+++ b/plugins/TabSRMM/res/NOVA/sounds_on.ico
diff --git a/plugins/Tabsrmm/res/NOVA/strike.ico b/plugins/TabSRMM/res/NOVA/strike.ico
index 6ecace8a51..6ecace8a51 100644
--- a/plugins/Tabsrmm/res/NOVA/strike.ico
+++ b/plugins/TabSRMM/res/NOVA/strike.ico
diff --git a/plugins/Tabsrmm/res/NOVA/underline.ico b/plugins/TabSRMM/res/NOVA/underline.ico
index 01cf64a36a..01cf64a36a 100644
--- a/plugins/Tabsrmm/res/NOVA/underline.ico
+++ b/plugins/TabSRMM/res/NOVA/underline.ico
diff --git a/plugins/Tabsrmm/res/NOVA/userprefs.ico b/plugins/TabSRMM/res/NOVA/userprefs.ico
index 7028f10d03..7028f10d03 100644
--- a/plugins/Tabsrmm/res/NOVA/userprefs.ico
+++ b/plugins/TabSRMM/res/NOVA/userprefs.ico
diff --git a/plugins/Tabsrmm/res/SKIN/close.ico b/plugins/TabSRMM/res/SKIN/close.ico
index 84bd384dbc..84bd384dbc 100644
--- a/plugins/Tabsrmm/res/SKIN/close.ico
+++ b/plugins/TabSRMM/res/SKIN/close.ico
diff --git a/plugins/Tabsrmm/res/SKIN/default.tabsrmm b/plugins/TabSRMM/res/SKIN/default.tabsrmm
index 2bfbf019a7..2bfbf019a7 100644
--- a/plugins/Tabsrmm/res/SKIN/default.tabsrmm
+++ b/plugins/TabSRMM/res/SKIN/default.tabsrmm
diff --git a/plugins/Tabsrmm/res/SKIN/default.tsk b/plugins/TabSRMM/res/SKIN/default.tsk
index 1bfea009d5..1bfea009d5 100644
--- a/plugins/Tabsrmm/res/SKIN/default.tsk
+++ b/plugins/TabSRMM/res/SKIN/default.tsk
diff --git a/plugins/Tabsrmm/res/SKIN/glyph.png b/plugins/TabSRMM/res/SKIN/glyph.png
index e6d4c1c016..e6d4c1c016 100644
--- a/plugins/Tabsrmm/res/SKIN/glyph.png
+++ b/plugins/TabSRMM/res/SKIN/glyph.png
diff --git a/plugins/Tabsrmm/res/SKIN/logo.png b/plugins/TabSRMM/res/SKIN/logo.png
index 4f2972bdaf..4f2972bdaf 100644
--- a/plugins/Tabsrmm/res/SKIN/logo.png
+++ b/plugins/TabSRMM/res/SKIN/logo.png
diff --git a/plugins/Tabsrmm/res/SKIN/maximize.ico b/plugins/TabSRMM/res/SKIN/maximize.ico
index 2abcf619e1..2abcf619e1 100644
--- a/plugins/Tabsrmm/res/SKIN/maximize.ico
+++ b/plugins/TabSRMM/res/SKIN/maximize.ico
diff --git a/plugins/Tabsrmm/res/SKIN/minimize.ico b/plugins/TabSRMM/res/SKIN/minimize.ico
index da6081edea..da6081edea 100644
--- a/plugins/Tabsrmm/res/SKIN/minimize.ico
+++ b/plugins/TabSRMM/res/SKIN/minimize.ico
diff --git a/plugins/Tabsrmm/res/SKIN/tabskin_aero.png b/plugins/TabSRMM/res/SKIN/tabskin_aero.png
index 9cbb5b99f4..9cbb5b99f4 100644
--- a/plugins/Tabsrmm/res/SKIN/tabskin_aero.png
+++ b/plugins/TabSRMM/res/SKIN/tabskin_aero.png
diff --git a/plugins/Tabsrmm/res/SKIN/tabskin_aero_button.png b/plugins/TabSRMM/res/SKIN/tabskin_aero_button.png
index 494e2c57d4..494e2c57d4 100644
--- a/plugins/Tabsrmm/res/SKIN/tabskin_aero_button.png
+++ b/plugins/TabSRMM/res/SKIN/tabskin_aero_button.png
diff --git a/plugins/Tabsrmm/res/SKIN/tabskin_aero_glow.png b/plugins/TabSRMM/res/SKIN/tabskin_aero_glow.png
index 5c989f6c3a..5c989f6c3a 100644
--- a/plugins/Tabsrmm/res/SKIN/tabskin_aero_glow.png
+++ b/plugins/TabSRMM/res/SKIN/tabskin_aero_glow.png
diff --git a/plugins/Tabsrmm/res/SKIN/unknown.png b/plugins/TabSRMM/res/SKIN/unknown.png
index ae8aad4f41..ae8aad4f41 100644
--- a/plugins/Tabsrmm/res/SKIN/unknown.png
+++ b/plugins/TabSRMM/res/SKIN/unknown.png
diff --git a/plugins/Tabsrmm/res/leftarrow.ico b/plugins/TabSRMM/res/leftarrow.ico
index f225f4889c..f225f4889c 100644
--- a/plugins/Tabsrmm/res/leftarrow.ico
+++ b/plugins/TabSRMM/res/leftarrow.ico
diff --git a/plugins/Tabsrmm/res/messAnim/M1.ico b/plugins/TabSRMM/res/messAnim/M1.ico
index 351ea67b42..351ea67b42 100644
--- a/plugins/Tabsrmm/res/messAnim/M1.ico
+++ b/plugins/TabSRMM/res/messAnim/M1.ico
diff --git a/plugins/Tabsrmm/res/messAnim/M2.ico b/plugins/TabSRMM/res/messAnim/M2.ico
index f13dedaca8..f13dedaca8 100644
--- a/plugins/Tabsrmm/res/messAnim/M2.ico
+++ b/plugins/TabSRMM/res/messAnim/M2.ico
diff --git a/plugins/Tabsrmm/res/messAnim/M3.ico b/plugins/TabSRMM/res/messAnim/M3.ico
index 635a7c20f0..635a7c20f0 100644
--- a/plugins/Tabsrmm/res/messAnim/M3.ico
+++ b/plugins/TabSRMM/res/messAnim/M3.ico
diff --git a/plugins/Tabsrmm/res/messAnim/M4.ico b/plugins/TabSRMM/res/messAnim/M4.ico
index 752e97005d..752e97005d 100644
--- a/plugins/Tabsrmm/res/messAnim/M4.ico
+++ b/plugins/TabSRMM/res/messAnim/M4.ico
diff --git a/plugins/Tabsrmm/res/overlay_disabled.ico b/plugins/TabSRMM/res/overlay_disabled.ico
index 49d7bf1805..49d7bf1805 100644
--- a/plugins/Tabsrmm/res/overlay_disabled.ico
+++ b/plugins/TabSRMM/res/overlay_disabled.ico
diff --git a/plugins/Tabsrmm/res/overlay_enabled.ico b/plugins/TabSRMM/res/overlay_enabled.ico
index 780544d440..780544d440 100644
--- a/plugins/Tabsrmm/res/overlay_enabled.ico
+++ b/plugins/TabSRMM/res/overlay_enabled.ico
diff --git a/plugins/Tabsrmm/res/proxal/Font2.ico b/plugins/TabSRMM/res/proxal/Font2.ico
index 40ba164cfe..40ba164cfe 100644
--- a/plugins/Tabsrmm/res/proxal/Font2.ico
+++ b/plugins/TabSRMM/res/proxal/Font2.ico
diff --git a/plugins/Tabsrmm/res/proxal/Incom.ico b/plugins/TabSRMM/res/proxal/Incom.ico
index 285cb6053b..285cb6053b 100644
--- a/plugins/Tabsrmm/res/proxal/Incom.ico
+++ b/plugins/TabSRMM/res/proxal/Incom.ico
diff --git a/plugins/Tabsrmm/res/proxal/Outg.ico b/plugins/TabSRMM/res/proxal/Outg.ico
index 5680900f59..5680900f59 100644
--- a/plugins/Tabsrmm/res/proxal/Outg.ico
+++ b/plugins/TabSRMM/res/proxal/Outg.ico
diff --git a/plugins/Tabsrmm/res/proxal/Pencil.ico b/plugins/TabSRMM/res/proxal/Pencil.ico
index 95ce9ef31c..95ce9ef31c 100644
--- a/plugins/Tabsrmm/res/proxal/Pencil.ico
+++ b/plugins/TabSRMM/res/proxal/Pencil.ico
diff --git a/plugins/Tabsrmm/res/proxal/Status change.ico b/plugins/TabSRMM/res/proxal/Status change.ico
index 6ff4abcdb6..6ff4abcdb6 100644
--- a/plugins/Tabsrmm/res/proxal/Status change.ico
+++ b/plugins/TabSRMM/res/proxal/Status change.ico
diff --git a/plugins/Tabsrmm/res/proxal/avatar.ico b/plugins/TabSRMM/res/proxal/avatar.ico
index f6ef57240b..f6ef57240b 100644
--- a/plugins/Tabsrmm/res/proxal/avatar.ico
+++ b/plugins/TabSRMM/res/proxal/avatar.ico
diff --git a/plugins/Tabsrmm/res/proxal/block.ico b/plugins/TabSRMM/res/proxal/block.ico
index e46440788a..e46440788a 100644
--- a/plugins/Tabsrmm/res/proxal/block.ico
+++ b/plugins/TabSRMM/res/proxal/block.ico
diff --git a/plugins/Tabsrmm/res/proxal/bold.ico b/plugins/TabSRMM/res/proxal/bold.ico
index 9940db4ba9..9940db4ba9 100644
--- a/plugins/Tabsrmm/res/proxal/bold.ico
+++ b/plugins/TabSRMM/res/proxal/bold.ico
diff --git a/plugins/Tabsrmm/res/proxal/check.ico b/plugins/TabSRMM/res/proxal/check.ico
index 1472a6e681..1472a6e681 100644
--- a/plugins/Tabsrmm/res/proxal/check.ico
+++ b/plugins/TabSRMM/res/proxal/check.ico
diff --git a/plugins/Tabsrmm/res/proxal/color.ico b/plugins/TabSRMM/res/proxal/color.ico
index 11c54ab502..11c54ab502 100644
--- a/plugins/Tabsrmm/res/proxal/color.ico
+++ b/plugins/TabSRMM/res/proxal/color.ico
diff --git a/plugins/Tabsrmm/res/proxal/delete.ico b/plugins/TabSRMM/res/proxal/delete.ico
index c5266a6b84..c5266a6b84 100644
--- a/plugins/Tabsrmm/res/proxal/delete.ico
+++ b/plugins/TabSRMM/res/proxal/delete.ico
diff --git a/plugins/Tabsrmm/res/proxal/emoticon.ico b/plugins/TabSRMM/res/proxal/emoticon.ico
index d22cd0c95b..d22cd0c95b 100644
--- a/plugins/Tabsrmm/res/proxal/emoticon.ico
+++ b/plugins/TabSRMM/res/proxal/emoticon.ico
diff --git a/plugins/Tabsrmm/res/proxal/favlist.ico b/plugins/TabSRMM/res/proxal/favlist.ico
index 2f6f34dcf4..2f6f34dcf4 100644
--- a/plugins/Tabsrmm/res/proxal/favlist.ico
+++ b/plugins/TabSRMM/res/proxal/favlist.ico
diff --git a/plugins/Tabsrmm/res/proxal/file.ico b/plugins/TabSRMM/res/proxal/file.ico
index 7a130f520e..7a130f520e 100644
--- a/plugins/Tabsrmm/res/proxal/file.ico
+++ b/plugins/TabSRMM/res/proxal/file.ico
diff --git a/plugins/Tabsrmm/res/proxal/font.ico b/plugins/TabSRMM/res/proxal/font.ico
index e866b666e0..e866b666e0 100644
--- a/plugins/Tabsrmm/res/proxal/font.ico
+++ b/plugins/TabSRMM/res/proxal/font.ico
diff --git a/plugins/Tabsrmm/res/proxal/history.ico b/plugins/TabSRMM/res/proxal/history.ico
index b2477bc7d3..b2477bc7d3 100644
--- a/plugins/Tabsrmm/res/proxal/history.ico
+++ b/plugins/TabSRMM/res/proxal/history.ico
diff --git a/plugins/Tabsrmm/res/proxal/info.ico b/plugins/TabSRMM/res/proxal/info.ico
index c8b2beb955..c8b2beb955 100644
--- a/plugins/Tabsrmm/res/proxal/info.ico
+++ b/plugins/TabSRMM/res/proxal/info.ico
diff --git a/plugins/Tabsrmm/res/proxal/italic.ico b/plugins/TabSRMM/res/proxal/italic.ico
index c94d290436..c94d290436 100644
--- a/plugins/Tabsrmm/res/proxal/italic.ico
+++ b/plugins/TabSRMM/res/proxal/italic.ico
diff --git a/plugins/Tabsrmm/res/proxal/message.ico b/plugins/TabSRMM/res/proxal/message.ico
index 963cec572c..963cec572c 100644
--- a/plugins/Tabsrmm/res/proxal/message.ico
+++ b/plugins/TabSRMM/res/proxal/message.ico
diff --git a/plugins/Tabsrmm/res/proxal/mtn.ico b/plugins/TabSRMM/res/proxal/mtn.ico
index c66482a55f..c66482a55f 100644
--- a/plugins/Tabsrmm/res/proxal/mtn.ico
+++ b/plugins/TabSRMM/res/proxal/mtn.ico
diff --git a/plugins/Tabsrmm/res/proxal/multisend.ico b/plugins/TabSRMM/res/proxal/multisend.ico
index adb0a7bf3b..adb0a7bf3b 100644
--- a/plugins/Tabsrmm/res/proxal/multisend.ico
+++ b/plugins/TabSRMM/res/proxal/multisend.ico
diff --git a/plugins/Tabsrmm/res/proxal/nomtn.ico b/plugins/TabSRMM/res/proxal/nomtn.ico
index 76d70f0182..76d70f0182 100644
--- a/plugins/Tabsrmm/res/proxal/nomtn.ico
+++ b/plugins/TabSRMM/res/proxal/nomtn.ico
diff --git a/plugins/Tabsrmm/res/proxal/options.ico b/plugins/TabSRMM/res/proxal/options.ico
index e72c9e75a2..e72c9e75a2 100644
--- a/plugins/Tabsrmm/res/proxal/options.ico
+++ b/plugins/TabSRMM/res/proxal/options.ico
diff --git a/plugins/Tabsrmm/res/proxal/plus.ico b/plugins/TabSRMM/res/proxal/plus.ico
index 664f6c87a7..664f6c87a7 100644
--- a/plugins/Tabsrmm/res/proxal/plus.ico
+++ b/plugins/TabSRMM/res/proxal/plus.ico
diff --git a/plugins/Tabsrmm/res/proxal/quote.ico b/plugins/TabSRMM/res/proxal/quote.ico
index 156f4e6805..156f4e6805 100644
--- a/plugins/Tabsrmm/res/proxal/quote.ico
+++ b/plugins/TabSRMM/res/proxal/quote.ico
diff --git a/plugins/Tabsrmm/res/proxal/recentlist.ico b/plugins/TabSRMM/res/proxal/recentlist.ico
index 1902ff2c9d..1902ff2c9d 100644
--- a/plugins/Tabsrmm/res/proxal/recentlist.ico
+++ b/plugins/TabSRMM/res/proxal/recentlist.ico
diff --git a/plugins/Tabsrmm/res/proxal/sbaroptions.ico b/plugins/TabSRMM/res/proxal/sbaroptions.ico
index 3bf4dc2d5c..3bf4dc2d5c 100644
--- a/plugins/Tabsrmm/res/proxal/sbaroptions.ico
+++ b/plugins/TabSRMM/res/proxal/sbaroptions.ico
diff --git a/plugins/Tabsrmm/res/proxal/secureOff.ico b/plugins/TabSRMM/res/proxal/secureOff.ico
index 085bdb6d6b..085bdb6d6b 100644
--- a/plugins/Tabsrmm/res/proxal/secureOff.ico
+++ b/plugins/TabSRMM/res/proxal/secureOff.ico
diff --git a/plugins/Tabsrmm/res/proxal/secureon.ico b/plugins/TabSRMM/res/proxal/secureon.ico
index e17fb86f6f..e17fb86f6f 100644
--- a/plugins/Tabsrmm/res/proxal/secureon.ico
+++ b/plugins/TabSRMM/res/proxal/secureon.ico
diff --git a/plugins/Tabsrmm/res/proxal/slist.ico b/plugins/TabSRMM/res/proxal/slist.ico
index 0ca1f31b90..0ca1f31b90 100644
--- a/plugins/Tabsrmm/res/proxal/slist.ico
+++ b/plugins/TabSRMM/res/proxal/slist.ico
diff --git a/plugins/Tabsrmm/res/proxal/sounds_off.ico b/plugins/TabSRMM/res/proxal/sounds_off.ico
index f797c207c8..f797c207c8 100644
--- a/plugins/Tabsrmm/res/proxal/sounds_off.ico
+++ b/plugins/TabSRMM/res/proxal/sounds_off.ico
diff --git a/plugins/Tabsrmm/res/proxal/sounds_on.ico b/plugins/TabSRMM/res/proxal/sounds_on.ico
index 7e5f84f8d5..7e5f84f8d5 100644
--- a/plugins/Tabsrmm/res/proxal/sounds_on.ico
+++ b/plugins/TabSRMM/res/proxal/sounds_on.ico
diff --git a/plugins/Tabsrmm/res/proxal/strikethrough.ico b/plugins/TabSRMM/res/proxal/strikethrough.ico
index f7be9ce972..f7be9ce972 100644
--- a/plugins/Tabsrmm/res/proxal/strikethrough.ico
+++ b/plugins/TabSRMM/res/proxal/strikethrough.ico
diff --git a/plugins/Tabsrmm/res/proxal/underline.ico b/plugins/TabSRMM/res/proxal/underline.ico
index 5137d8cb66..5137d8cb66 100644
--- a/plugins/Tabsrmm/res/proxal/underline.ico
+++ b/plugins/TabSRMM/res/proxal/underline.ico
diff --git a/plugins/Tabsrmm/res/proxal/userprefs.ico b/plugins/TabSRMM/res/proxal/userprefs.ico
index 86753ad578..86753ad578 100644
--- a/plugins/Tabsrmm/res/proxal/userprefs.ico
+++ b/plugins/TabSRMM/res/proxal/userprefs.ico
diff --git a/plugins/Tabsrmm/res/pulldown.ico b/plugins/TabSRMM/res/pulldown.ico
index 372482f6c1..372482f6c1 100644
--- a/plugins/Tabsrmm/res/pulldown.ico
+++ b/plugins/TabSRMM/res/pulldown.ico
diff --git a/plugins/Tabsrmm/res/pullup.ico b/plugins/TabSRMM/res/pullup.ico
index 735916cca1..735916cca1 100644
--- a/plugins/Tabsrmm/res/pullup.ico
+++ b/plugins/TabSRMM/res/pullup.ico
diff --git a/plugins/Tabsrmm/res/res_TN/popup.ico b/plugins/TabSRMM/res/res_TN/popup.ico
index 2ae079b729..2ae079b729 100644
--- a/plugins/Tabsrmm/res/res_TN/popup.ico
+++ b/plugins/TabSRMM/res/res_TN/popup.ico
diff --git a/plugins/Tabsrmm/res/res_TN/popup_no.ico b/plugins/TabSRMM/res/res_TN/popup_no.ico
index 11ba330c3a..11ba330c3a 100644
--- a/plugins/Tabsrmm/res/res_TN/popup_no.ico
+++ b/plugins/TabSRMM/res/res_TN/popup_no.ico
diff --git a/plugins/Tabsrmm/res/rightarrow.ico b/plugins/TabSRMM/res/rightarrow.ico
index 7a62791682..7a62791682 100644
--- a/plugins/Tabsrmm/res/rightarrow.ico
+++ b/plugins/TabSRMM/res/rightarrow.ico
diff --git a/plugins/Tabsrmm/res/unknown.bmp b/plugins/TabSRMM/res/unknown.bmp
index 96bdb0fd83..96bdb0fd83 100644
--- a/plugins/Tabsrmm/res/unknown.bmp
+++ b/plugins/TabSRMM/res/unknown.bmp
diff --git a/plugins/Tabsrmm/resource.rc b/plugins/TabSRMM/resource.rc
index 27618792f5..27618792f5 100644
--- a/plugins/Tabsrmm/resource.rc
+++ b/plugins/TabSRMM/resource.rc
diff --git a/plugins/Tabsrmm/sdkbuild.bat b/plugins/TabSRMM/sdkbuild.bat
index 4f8d762dbd..4f8d762dbd 100644
--- a/plugins/Tabsrmm/sdkbuild.bat
+++ b/plugins/TabSRMM/sdkbuild.bat
diff --git a/plugins/Tabsrmm/skin/Back1.png b/plugins/TabSRMM/skin/Back1.png
index a26787c4ce..a26787c4ce 100644
--- a/plugins/Tabsrmm/skin/Back1.png
+++ b/plugins/TabSRMM/skin/Back1.png
diff --git a/plugins/Tabsrmm/skin/Back1Inactive.png b/plugins/TabSRMM/skin/Back1Inactive.png
index d68a175f2f..d68a175f2f 100644
--- a/plugins/Tabsrmm/skin/Back1Inactive.png
+++ b/plugins/TabSRMM/skin/Back1Inactive.png
diff --git a/plugins/Tabsrmm/skin/button.png b/plugins/TabSRMM/skin/button.png
index 5b7e36fdc8..5b7e36fdc8 100644
--- a/plugins/Tabsrmm/skin/button.png
+++ b/plugins/TabSRMM/skin/button.png
diff --git a/plugins/Tabsrmm/skin/button_hover.png b/plugins/TabSRMM/skin/button_hover.png
index 42978749e3..42978749e3 100644
--- a/plugins/Tabsrmm/skin/button_hover.png
+++ b/plugins/TabSRMM/skin/button_hover.png
diff --git a/plugins/Tabsrmm/skin/buttonpressed.png b/plugins/TabSRMM/skin/buttonpressed.png
index db0212b6e9..db0212b6e9 100644
--- a/plugins/Tabsrmm/skin/buttonpressed.png
+++ b/plugins/TabSRMM/skin/buttonpressed.png
diff --git a/plugins/Tabsrmm/skin/close.ico b/plugins/TabSRMM/skin/close.ico
index ddb5404bd0..ddb5404bd0 100644
--- a/plugins/Tabsrmm/skin/close.ico
+++ b/plugins/TabSRMM/skin/close.ico
diff --git a/plugins/Tabsrmm/skin/frames.png b/plugins/TabSRMM/skin/frames.png
index b14d31079b..b14d31079b 100644
--- a/plugins/Tabsrmm/skin/frames.png
+++ b/plugins/TabSRMM/skin/frames.png
diff --git a/plugins/Tabsrmm/skin/maximize.ico b/plugins/TabSRMM/skin/maximize.ico
index 0aa6781335..0aa6781335 100644
--- a/plugins/Tabsrmm/skin/maximize.ico
+++ b/plugins/TabSRMM/skin/maximize.ico
diff --git a/plugins/Tabsrmm/skin/minimize.ico b/plugins/TabSRMM/skin/minimize.ico
index dad985d2c2..dad985d2c2 100644
--- a/plugins/Tabsrmm/skin/minimize.ico
+++ b/plugins/TabSRMM/skin/minimize.ico
diff --git a/plugins/Tabsrmm/skin/panel.png b/plugins/TabSRMM/skin/panel.png
index e9c66e74cd..e9c66e74cd 100644
--- a/plugins/Tabsrmm/skin/panel.png
+++ b/plugins/TabSRMM/skin/panel.png
diff --git a/plugins/Tabsrmm/skin/tab.png b/plugins/TabSRMM/skin/tab.png
index 908a3862c9..908a3862c9 100644
--- a/plugins/Tabsrmm/skin/tab.png
+++ b/plugins/TabSRMM/skin/tab.png
diff --git a/plugins/Tabsrmm/skin/tabhover.png b/plugins/TabSRMM/skin/tabhover.png
index b520898d54..b520898d54 100644
--- a/plugins/Tabsrmm/skin/tabhover.png
+++ b/plugins/TabSRMM/skin/tabhover.png
diff --git a/plugins/Tabsrmm/skin/tabsrmm.tsk b/plugins/TabSRMM/skin/tabsrmm.tsk
index 95db064216..95db064216 100644
--- a/plugins/Tabsrmm/skin/tabsrmm.tsk
+++ b/plugins/TabSRMM/skin/tabsrmm.tsk
diff --git a/plugins/Tabsrmm/skin/textborder.png b/plugins/TabSRMM/skin/textborder.png
index 61af9e959b..61af9e959b 100644
--- a/plugins/Tabsrmm/skin/textborder.png
+++ b/plugins/TabSRMM/skin/textborder.png
diff --git a/plugins/Tabsrmm/src/ImageDataObject.cpp b/plugins/TabSRMM/src/ImageDataObject.cpp
index 762dbba537..762dbba537 100644
--- a/plugins/Tabsrmm/src/ImageDataObject.cpp
+++ b/plugins/TabSRMM/src/ImageDataObject.cpp
diff --git a/plugins/Tabsrmm/src/TSButton.cpp b/plugins/TabSRMM/src/TSButton.cpp
index 57c3221f38..57c3221f38 100644
--- a/plugins/Tabsrmm/src/TSButton.cpp
+++ b/plugins/TabSRMM/src/TSButton.cpp
diff --git a/plugins/Tabsrmm/src/buttonsbar.cpp b/plugins/TabSRMM/src/buttonsbar.cpp
index fb50f7b576..fb50f7b576 100644
--- a/plugins/Tabsrmm/src/buttonsbar.cpp
+++ b/plugins/TabSRMM/src/buttonsbar.cpp
diff --git a/plugins/Tabsrmm/src/commonheaders.h b/plugins/TabSRMM/src/commonheaders.h
index 7b40ad1117..7b40ad1117 100644
--- a/plugins/Tabsrmm/src/commonheaders.h
+++ b/plugins/TabSRMM/src/commonheaders.h
diff --git a/plugins/Tabsrmm/src/contactcache.cpp b/plugins/TabSRMM/src/contactcache.cpp
index b30290d447..b30290d447 100644
--- a/plugins/Tabsrmm/src/contactcache.cpp
+++ b/plugins/TabSRMM/src/contactcache.cpp
diff --git a/plugins/Tabsrmm/src/container.cpp b/plugins/TabSRMM/src/container.cpp
index 2edbca9281..2edbca9281 100644
--- a/plugins/Tabsrmm/src/container.cpp
+++ b/plugins/TabSRMM/src/container.cpp
diff --git a/plugins/Tabsrmm/src/containeroptions.cpp b/plugins/TabSRMM/src/containeroptions.cpp
index dd87ef56d2..dd87ef56d2 100644
--- a/plugins/Tabsrmm/src/containeroptions.cpp
+++ b/plugins/TabSRMM/src/containeroptions.cpp
diff --git a/plugins/Tabsrmm/src/controls.cpp b/plugins/TabSRMM/src/controls.cpp
index f524de5f1a..f524de5f1a 100644
--- a/plugins/Tabsrmm/src/controls.cpp
+++ b/plugins/TabSRMM/src/controls.cpp
diff --git a/plugins/Tabsrmm/src/eventpopups.cpp b/plugins/TabSRMM/src/eventpopups.cpp
index ea1df5a209..ea1df5a209 100644
--- a/plugins/Tabsrmm/src/eventpopups.cpp
+++ b/plugins/TabSRMM/src/eventpopups.cpp
diff --git a/plugins/Tabsrmm/src/generic_msghandlers.cpp b/plugins/TabSRMM/src/generic_msghandlers.cpp
index d507076eae..d507076eae 100644
--- a/plugins/Tabsrmm/src/generic_msghandlers.cpp
+++ b/plugins/TabSRMM/src/generic_msghandlers.cpp
diff --git a/plugins/Tabsrmm/src/globals.cpp b/plugins/TabSRMM/src/globals.cpp
index 689b4cb53b..689b4cb53b 100644
--- a/plugins/Tabsrmm/src/globals.cpp
+++ b/plugins/TabSRMM/src/globals.cpp
diff --git a/plugins/Tabsrmm/src/hotkeyhandler.cpp b/plugins/TabSRMM/src/hotkeyhandler.cpp
index d203e2fd4d..d203e2fd4d 100644
--- a/plugins/Tabsrmm/src/hotkeyhandler.cpp
+++ b/plugins/TabSRMM/src/hotkeyhandler.cpp
diff --git a/plugins/Tabsrmm/src/infopanel.cpp b/plugins/TabSRMM/src/infopanel.cpp
index 1f6b978493..1f6b978493 100644
--- a/plugins/Tabsrmm/src/infopanel.cpp
+++ b/plugins/TabSRMM/src/infopanel.cpp
diff --git a/plugins/Tabsrmm/src/mim.cpp b/plugins/TabSRMM/src/mim.cpp
index 4dc9128a92..4dc9128a92 100644
--- a/plugins/Tabsrmm/src/mim.cpp
+++ b/plugins/TabSRMM/src/mim.cpp
diff --git a/plugins/Tabsrmm/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp
index 33b8234ae7..33b8234ae7 100644
--- a/plugins/Tabsrmm/src/msgdialog.cpp
+++ b/plugins/TabSRMM/src/msgdialog.cpp
diff --git a/plugins/Tabsrmm/src/msgdlgutils.cpp b/plugins/TabSRMM/src/msgdlgutils.cpp
index caefdcffc3..caefdcffc3 100644
--- a/plugins/Tabsrmm/src/msgdlgutils.cpp
+++ b/plugins/TabSRMM/src/msgdlgutils.cpp
diff --git a/plugins/Tabsrmm/src/msglog.cpp b/plugins/TabSRMM/src/msglog.cpp
index eb030bba9d..eb030bba9d 100644
--- a/plugins/Tabsrmm/src/msglog.cpp
+++ b/plugins/TabSRMM/src/msglog.cpp
diff --git a/plugins/Tabsrmm/src/msgoptions.cpp b/plugins/TabSRMM/src/msgoptions.cpp
index 7438925df1..7438925df1 100644
--- a/plugins/Tabsrmm/src/msgoptions.cpp
+++ b/plugins/TabSRMM/src/msgoptions.cpp
diff --git a/plugins/Tabsrmm/src/msgs.cpp b/plugins/TabSRMM/src/msgs.cpp
index 5c67a6a797..5c67a6a797 100644
--- a/plugins/Tabsrmm/src/msgs.cpp
+++ b/plugins/TabSRMM/src/msgs.cpp
diff --git a/plugins/Tabsrmm/src/selectcontainer.cpp b/plugins/TabSRMM/src/selectcontainer.cpp
index 975f7496a4..975f7496a4 100644
--- a/plugins/Tabsrmm/src/selectcontainer.cpp
+++ b/plugins/TabSRMM/src/selectcontainer.cpp
diff --git a/plugins/Tabsrmm/src/sendlater.cpp b/plugins/TabSRMM/src/sendlater.cpp
index 2cbf0b7237..2cbf0b7237 100644
--- a/plugins/Tabsrmm/src/sendlater.cpp
+++ b/plugins/TabSRMM/src/sendlater.cpp
diff --git a/plugins/Tabsrmm/src/sendqueue.cpp b/plugins/TabSRMM/src/sendqueue.cpp
index b4e90359e9..b4e90359e9 100644
--- a/plugins/Tabsrmm/src/sendqueue.cpp
+++ b/plugins/TabSRMM/src/sendqueue.cpp
diff --git a/plugins/Tabsrmm/src/sidebar.cpp b/plugins/TabSRMM/src/sidebar.cpp
index 85dbf3e6c3..85dbf3e6c3 100644
--- a/plugins/Tabsrmm/src/sidebar.cpp
+++ b/plugins/TabSRMM/src/sidebar.cpp
diff --git a/plugins/Tabsrmm/src/srmm.cpp b/plugins/TabSRMM/src/srmm.cpp
index 60af12edfd..60af12edfd 100644
--- a/plugins/Tabsrmm/src/srmm.cpp
+++ b/plugins/TabSRMM/src/srmm.cpp
diff --git a/plugins/Tabsrmm/src/tabctrl.cpp b/plugins/TabSRMM/src/tabctrl.cpp
index 2aadbd91f5..2aadbd91f5 100644
--- a/plugins/Tabsrmm/src/tabctrl.cpp
+++ b/plugins/TabSRMM/src/tabctrl.cpp
diff --git a/plugins/Tabsrmm/src/taskbar.cpp b/plugins/TabSRMM/src/taskbar.cpp
index dfe645bd4a..dfe645bd4a 100644
--- a/plugins/Tabsrmm/src/taskbar.cpp
+++ b/plugins/TabSRMM/src/taskbar.cpp
diff --git a/plugins/Tabsrmm/src/templates.cpp b/plugins/TabSRMM/src/templates.cpp
index 74000f7e11..74000f7e11 100644
--- a/plugins/Tabsrmm/src/templates.cpp
+++ b/plugins/TabSRMM/src/templates.cpp
diff --git a/plugins/Tabsrmm/src/themeio.cpp b/plugins/TabSRMM/src/themeio.cpp
index a331d921c1..a331d921c1 100644
--- a/plugins/Tabsrmm/src/themeio.cpp
+++ b/plugins/TabSRMM/src/themeio.cpp
diff --git a/plugins/Tabsrmm/src/themes.cpp b/plugins/TabSRMM/src/themes.cpp
index 65c1ec8e2f..65c1ec8e2f 100644
--- a/plugins/Tabsrmm/src/themes.cpp
+++ b/plugins/TabSRMM/src/themes.cpp
diff --git a/plugins/Tabsrmm/src/translator.cpp b/plugins/TabSRMM/src/translator.cpp
index 1e801152ea..1e801152ea 100644
--- a/plugins/Tabsrmm/src/translator.cpp
+++ b/plugins/TabSRMM/src/translator.cpp
diff --git a/plugins/Tabsrmm/src/trayicon.cpp b/plugins/TabSRMM/src/trayicon.cpp
index 28de552468..28de552468 100644
--- a/plugins/Tabsrmm/src/trayicon.cpp
+++ b/plugins/TabSRMM/src/trayicon.cpp
diff --git a/plugins/Tabsrmm/src/typingnotify.cpp b/plugins/TabSRMM/src/typingnotify.cpp
index ac6550c01f..ac6550c01f 100644
--- a/plugins/Tabsrmm/src/typingnotify.cpp
+++ b/plugins/TabSRMM/src/typingnotify.cpp
diff --git a/plugins/Tabsrmm/src/userprefs.cpp b/plugins/TabSRMM/src/userprefs.cpp
index 5691e71a65..5691e71a65 100644
--- a/plugins/Tabsrmm/src/userprefs.cpp
+++ b/plugins/TabSRMM/src/userprefs.cpp
diff --git a/plugins/Tabsrmm/src/utils.cpp b/plugins/TabSRMM/src/utils.cpp
index f4bd5ab118..f4bd5ab118 100644
--- a/plugins/Tabsrmm/src/utils.cpp
+++ b/plugins/TabSRMM/src/utils.cpp
diff --git a/plugins/Tabsrmm/tabmodplus/icons/imgclose.ico b/plugins/TabSRMM/tabmodplus/icons/imgclose.ico
index 615b00a98e..615b00a98e 100644
--- a/plugins/Tabsrmm/tabmodplus/icons/imgclose.ico
+++ b/plugins/TabSRMM/tabmodplus/icons/imgclose.ico
diff --git a/plugins/Tabsrmm/tabmodplus/icons/imgopen.ico b/plugins/TabSRMM/tabmodplus/icons/imgopen.ico
index c1a5c7514e..c1a5c7514e 100644
--- a/plugins/Tabsrmm/tabmodplus/icons/imgopen.ico
+++ b/plugins/TabSRMM/tabmodplus/icons/imgopen.ico
diff --git a/plugins/Tabsrmm/tabmodplus/modplus.cpp b/plugins/TabSRMM/tabmodplus/modplus.cpp
index b20b17c99e..b20b17c99e 100644
--- a/plugins/Tabsrmm/tabmodplus/modplus.cpp
+++ b/plugins/TabSRMM/tabmodplus/modplus.cpp
diff --git a/plugins/Tabsrmm/tabmodplus/msgoptions_plus.cpp b/plugins/TabSRMM/tabmodplus/msgoptions_plus.cpp
index 7b2c19bd26..7b2c19bd26 100644
--- a/plugins/Tabsrmm/tabmodplus/msgoptions_plus.cpp
+++ b/plugins/TabSRMM/tabmodplus/msgoptions_plus.cpp
diff --git a/plugins/Tabsrmm/tabsrmm_10.vcxproj b/plugins/TabSRMM/tabsrmm_10.vcxproj
index ab91489a7c..ab91489a7c 100644
--- a/plugins/Tabsrmm/tabsrmm_10.vcxproj
+++ b/plugins/TabSRMM/tabsrmm_10.vcxproj
diff --git a/plugins/Tabsrmm/tabsrmm_10.vcxproj.filters b/plugins/TabSRMM/tabsrmm_10.vcxproj.filters
index fb6d6a249d..fb6d6a249d 100644
--- a/plugins/Tabsrmm/tabsrmm_10.vcxproj.filters
+++ b/plugins/TabSRMM/tabsrmm_10.vcxproj.filters
diff --git a/plugins/Tabsrmm/tabsrmm_private.rc b/plugins/TabSRMM/tabsrmm_private.rc
index 01a0741e03..01a0741e03 100644
--- a/plugins/Tabsrmm/tabsrmm_private.rc
+++ b/plugins/TabSRMM/tabsrmm_private.rc
diff --git a/plugins/W7ui/clistproxywindow.cpp b/plugins/W7UI/clistproxywindow.cpp
index 12e5b476ed..12e5b476ed 100644
--- a/plugins/W7ui/clistproxywindow.cpp
+++ b/plugins/W7UI/clistproxywindow.cpp
diff --git a/plugins/W7ui/clistproxywindow.h b/plugins/W7UI/clistproxywindow.h
index 153c59089b..153c59089b 100644
--- a/plugins/W7ui/clistproxywindow.h
+++ b/plugins/W7UI/clistproxywindow.h
diff --git a/plugins/W7ui/dwmwindow.cpp b/plugins/W7UI/dwmwindow.cpp
index 2d8dd6e9e4..2d8dd6e9e4 100644
--- a/plugins/W7ui/dwmwindow.cpp
+++ b/plugins/W7UI/dwmwindow.cpp
diff --git a/plugins/W7ui/dwmwindow.h b/plugins/W7UI/dwmwindow.h
index e795823247..e795823247 100644
--- a/plugins/W7ui/dwmwindow.h
+++ b/plugins/W7UI/dwmwindow.h
diff --git a/plugins/W7ui/headers.h b/plugins/W7UI/headers.h
index 723be59ac7..723be59ac7 100644
--- a/plugins/W7ui/headers.h
+++ b/plugins/W7UI/headers.h
diff --git a/plugins/W7ui/jumplist.cpp b/plugins/W7UI/jumplist.cpp
index 4fd1a68e9d..4fd1a68e9d 100644
--- a/plugins/W7ui/jumplist.cpp
+++ b/plugins/W7UI/jumplist.cpp
diff --git a/plugins/W7ui/jumplist.h b/plugins/W7UI/jumplist.h
index de5a6f0548..de5a6f0548 100644
--- a/plugins/W7ui/jumplist.h
+++ b/plugins/W7UI/jumplist.h
diff --git a/plugins/W7ui/jumplistarray.cpp b/plugins/W7UI/jumplistarray.cpp
index 669a7784ef..669a7784ef 100644
--- a/plugins/W7ui/jumplistarray.cpp
+++ b/plugins/W7UI/jumplistarray.cpp
diff --git a/plugins/W7ui/jumplistarray.h b/plugins/W7UI/jumplistarray.h
index c9f2a8b979..c9f2a8b979 100644
--- a/plugins/W7ui/jumplistarray.h
+++ b/plugins/W7UI/jumplistarray.h
diff --git a/plugins/W7ui/jumplistbuilder.cpp b/plugins/W7UI/jumplistbuilder.cpp
index 5e5f1d9f65..5e5f1d9f65 100644
--- a/plugins/W7ui/jumplistbuilder.cpp
+++ b/plugins/W7UI/jumplistbuilder.cpp
diff --git a/plugins/W7ui/jumplistbuilder.h b/plugins/W7UI/jumplistbuilder.h
index f0e1cbd438..f0e1cbd438 100644
--- a/plugins/W7ui/jumplistbuilder.h
+++ b/plugins/W7UI/jumplistbuilder.h
diff --git a/plugins/W7ui/main.cpp b/plugins/W7UI/main.cpp
index 3e50ca234a..3e50ca234a 100644
--- a/plugins/W7ui/main.cpp
+++ b/plugins/W7UI/main.cpp
diff --git a/plugins/W7ui/srmmproxywindow.cpp b/plugins/W7UI/srmmproxywindow.cpp
index a70ca1b672..a70ca1b672 100644
--- a/plugins/W7ui/srmmproxywindow.cpp
+++ b/plugins/W7UI/srmmproxywindow.cpp
diff --git a/plugins/W7ui/srmmproxywindow.h b/plugins/W7UI/srmmproxywindow.h
index f1c447d4e8..f1c447d4e8 100644
--- a/plugins/W7ui/srmmproxywindow.h
+++ b/plugins/W7UI/srmmproxywindow.h
diff --git a/plugins/W7ui/subclassmgr.cpp b/plugins/W7UI/subclassmgr.cpp
index e69de29bb2..e69de29bb2 100644
--- a/plugins/W7ui/subclassmgr.cpp
+++ b/plugins/W7UI/subclassmgr.cpp
diff --git a/plugins/W7ui/subclassmgr.h b/plugins/W7UI/subclassmgr.h
index 1cf2433254..1cf2433254 100644
--- a/plugins/W7ui/subclassmgr.h
+++ b/plugins/W7UI/subclassmgr.h
diff --git a/plugins/W7ui/w7ui.cpp b/plugins/W7UI/w7ui.cpp
index afce9b65eb..afce9b65eb 100644
--- a/plugins/W7ui/w7ui.cpp
+++ b/plugins/W7UI/w7ui.cpp
diff --git a/plugins/W7ui/w7ui_10.sln b/plugins/W7UI/w7ui_10.sln
index 04009a62ce..04009a62ce 100644
--- a/plugins/W7ui/w7ui_10.sln
+++ b/plugins/W7UI/w7ui_10.sln
diff --git a/plugins/W7ui/w7ui_10.vcxproj b/plugins/W7UI/w7ui_10.vcxproj
index f013f5be54..f013f5be54 100644
--- a/plugins/W7ui/w7ui_10.vcxproj
+++ b/plugins/W7UI/w7ui_10.vcxproj
diff --git a/plugins/W7ui/win7api.cpp b/plugins/W7UI/win7api.cpp
index dcfb6058ec..dcfb6058ec 100644
--- a/plugins/W7ui/win7api.cpp
+++ b/plugins/W7UI/win7api.cpp
diff --git a/plugins/W7ui/win7api.h b/plugins/W7UI/win7api.h
index f9fa806335..f9fa806335 100644
--- a/plugins/W7ui/win7api.h
+++ b/plugins/W7UI/win7api.h
diff --git a/plugins/W7ui/win7api_ICustomDestinationList.h b/plugins/W7UI/win7api_ICustomDestinationList.h
index 6d3f770d29..6d3f770d29 100644
--- a/plugins/W7ui/win7api_ICustomDestinationList.h
+++ b/plugins/W7UI/win7api_ICustomDestinationList.h
diff --git a/plugins/W7ui/win7api_IObjectArray.h b/plugins/W7UI/win7api_IObjectArray.h
index 2102276989..2102276989 100644
--- a/plugins/W7ui/win7api_IObjectArray.h
+++ b/plugins/W7UI/win7api_IObjectArray.h
diff --git a/plugins/W7ui/win7api_IObjectCollection.h b/plugins/W7UI/win7api_IObjectCollection.h
index 71b37d0e99..71b37d0e99 100644
--- a/plugins/W7ui/win7api_IObjectCollection.h
+++ b/plugins/W7UI/win7api_IObjectCollection.h
diff --git a/plugins/W7ui/win7api_ITaskbarList3.h b/plugins/W7UI/win7api_ITaskbarList3.h
index 8c39fb5c41..8c39fb5c41 100644
--- a/plugins/W7ui/win7api_ITaskbarList3.h
+++ b/plugins/W7UI/win7api_ITaskbarList3.h
diff --git a/plugins/json/libjson.sln b/plugins/json/libjson.sln
new file mode 100644
index 0000000000..8720dc7064
--- /dev/null
+++ b/plugins/json/libjson.sln
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjson", "libjson.vcxproj", "{F6B2FB04-4FFD-419F-BC9F-8CC43F00C2B0}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{F6B2FB04-4FFD-419F-BC9F-8CC43F00C2B0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F6B2FB04-4FFD-419F-BC9F-8CC43F00C2B0}.Debug|Win32.Build.0 = Debug|Win32
+		{F6B2FB04-4FFD-419F-BC9F-8CC43F00C2B0}.Release|Win32.ActiveCfg = Release|Win32
+		{F6B2FB04-4FFD-419F-BC9F-8CC43F00C2B0}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/protocols/JabberG/jabber_xstatus.cpp b/protocols/JabberG/jabber_xstatus.cpp
index f49a7f7c3d..96bc7fd948 100644
--- a/protocols/JabberG/jabber_xstatus.cpp
+++ b/protocols/JabberG/jabber_xstatus.cpp
@@ -35,7 +35,7 @@ Last change by : $Author: Michael.Kunz@s2005.TU-Chemnitz.de $
 #include <m_cluiframes.h>
 
 #include "m_proto_listeningto.h"
-#include "sdk/m_skin_eng.h"
+#include "m_skin_eng.h"
 #include "m_extraicons.h"
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/protocols/JabberG/sdk/m_skin_eng.h b/protocols/JabberG/sdk/m_skin_eng.h
deleted file mode 100644
index 4bcc6cce52..0000000000
--- a/protocols/JabberG/sdk/m_skin_eng.h
+++ /dev/null
@@ -1,383 +0,0 @@
-/*
-
-Miranda IM: the free IM client for Microsoft* Windows*
-
-Copyright 2000-2007 Miranda ICQ/IM project, 
-all portions of this codebase are copyrighted to the people 
-listed in contributors.txt.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-#ifndef M_ske_H_INC
-#define M_ske_H_INC
-
-#include "newpluginapi.h"
-#include "m_clui.h"
-
-
-/*defaults*/
-#define DEFAULT_FIT_MODE    FM_STRETCH
-#define DEFAULT_STYLE       ST_BRUSH  
-#define DEFAULT_BKCOLOUR    GetSysColor(COLOR_3DFACE)
-#define DEFAULT_SELBKCOLOUR   GetSysColor(COLOR_HIGHLIGHT)
-#define SIZING_MARGIN 3
-
-/* Fit mode */
-#define FM_STRETCH      0
-#define FM_TILE_HORZ    1
-#define FM_TILE_VERT    2
-#define FM_TILE_BOTH    3
-
-/*Object types*/
-#define OT_ANY          0
-#define OT_GLYPHOBJECT  1
-#define OT_FONTOBJECT   2
-
-/*STYLE INDEXEX*/
-#define ST_SKIP         0
-#define ST_PARENT       1
-#define ST_BRUSH        2
-#define ST_IMAGE        3
-#define ST_SOLARIZE     4  //Not used yet.
-#define ST_FRAGMENT     5
-#define ST_GRADIENT     6
-
-//formats:
-#define ADT_TOP                      0x00000000
-#define ADT_LEFT                     0x00000000
-#define ADT_HCENTER                  0x00000001
-#define ADT_RIGHT                    0x00000002
-#define ADT_VCENTER                  0x00000004
-#define ADT_BOTTOM                   0x00000008
-//#define ADT_ECLIPSE 64
-
-
-/*SERVICES*/
-
-//toggle the 'hide offline contacts' flag and call CLUI   
-//wParam=0
-//lParam=0
-#define MS_CLIST_TOGGLEHIDEOFFLINE  "CList/ToggleHideOffline"
-
-#define MS_CLIST_TOGGLEGROUPS  "CList/ToggleGroups"
-
-#define MS_CLIST_TOGGLESOUNDS  "CList/ToggleSounds"
-
-// Add new object to skin object list.
-// wParam = pointer to SKINOBJECTDESCRIPTOR structure
-// lParam = 0 ( used for internal purposes: pointer to skin object list)
-#define MS_SKIN_REGISTEROBJECT "ModernList/RegisterObject"
-
-// Add new object to skin object list.
-// wParam = pointer to DEF_SKIN_OBJECT_PARAMS structure
-// lParam = 0 ( used for internal purposes: pointer to skin object list)
-#define MS_SKIN_REGISTERDEFOBJECT "ModernList/RegisterDefObject"
-
-typedef struct s_DEF_SKIN_OBJECT_PARAMS
-{
-  char * szObjectID;
-  BYTE defStyle;
-  DWORD defColor;
-  //    SKINOBJECTSLIST * Skin;
-} DEF_SKIN_OBJECT_PARAMS;
-
-
-// Request painting glyph object 
-// wParam = pointer to SKINDRAWREQUEST structure
-// lParam = 0
-#define MS_SKIN_DRAWGLYPH "ModernList/DrawGlyph"
-
-
-
-/* EVENTS */
-#define ME_SKIN_SERVICESCREATED "ModernList/ServicesCreated"
-
-/* DRAWGLYPH Request structure */
-typedef struct s_SKINDRAWREQUEST
-{
-  char szObjectID[255];      // Unic Object ID (path) to paint
-  RECT rcDestRect;           // Rectangle to fit
-  RECT rcClipRect;           // Rectangle to paint in.
-  HDC hDC;                   // Handler to device context to paint in. 
-} SKINDRAWREQUEST,*LPSKINDRAWREQUEST;
-
-/* SKINOBJECTDESCRIPTOR opbject descriptor structure */
-typedef struct tagSKINOBJECTDESCRIPTOR  
-{
-  BYTE    bType;              // One of OT_* values.
-  char*   szObjectID;         // Unic Object ID (path) [255] max
-  LPVOID  Data;               // Pointer to GLYPHOBJECT strycture if bType==OT_GLYPHOBJECT
-} SKINOBJECTDESCRIPTOR, *LPSKINOBJECTDESCRIPTOR;
-
-/* SKINOBJECTDESCRIPTOR opbject descriptor structure */
-typedef struct s_GLYPHOBJECT
-{
-  BYTE Style;                                // One of ST_* values 
-  HBITMAP hGlyph;                            // Bitmap handler (for internal use only)
-  DWORD dwTop, dwLeft, dwBottom, dwRight;    // Margins 
-  char* szFileName;                          // FileName of image
-  DWORD dwColor;                             // Fill color
-  BYTE dwAlpha;                              // Constant alpha-transparency level
-  BYTE FitMode;                              // One of FM_* values
-  POINT clipArea;                            // Object image rect on full image
-  SIZE szclipArea;                           // Object image rect on full image
-  SortedList * plTextList;                   // List of GLYPHTEXT
-  LONG bmWidth;
-  LONG bmHeight;
-  BYTE bmBitsPixel;
-} GLYPHOBJECT,*LPGLYPHOBJECT;
-
-/* SKINTEXTDESCRIPTOR opbject descriptor structure */
-typedef struct s_GLYPHTEXT
-{
-  char        * szGlyphTextID;
-  TCHAR       * stText;
-  TCHAR       * stValueText;
-  DWORD         dwFlags;
-  DWORD         dwColor;                     // Color (InvAA)(RR)(GG)(BB)
-  DWORD         dwShadow;                    //ToDo: Color2/Shaddow
-  int           iLeft,iTop,iRight,iBottom;
-  BYTE          RelativeFlags;
-  char        * szFontID;
-  HFONT         hFont;
-  char		  * szObjectName;
-}GLYPHTEXT,*LPGLYPHTEXT;
-
-/* SKINTEXTDESCRIPTOR opbject descriptor structure */
-typedef struct s_SKINFONT
-{
-  char        * szFontID;
-  HFONT         hFont;
-}SKINFONT, *LPSKINFONT;
-
-/* HELPER FUNCTIONS */
-
-//Paint  ObjectID as parent background for frame hwndIn
-int __inline SkinDrawWindowBack(HWND hwndIn, HDC hdc, RECT * rcClip, char * objectID);
-//Paint  ObjectID
-int __inline SkinDrawGlyph(HDC hdc, RECT * rcSize, RECT * rcClip, char * objectID);
-//Register object with predefined style
-int __inline CreateGlyphedObjectDefStyle(char * ObjID,BYTE defStyle);
-int __inline CreateGlyphedObjectDefColor(char * ObjID,DWORD defColor);
-//Register default object
-int __inline CreateGlyphedObject(char * ObjID);
-
-
-
-//// Creating and registering objects
-//int __inline CreateGlyphedObject(char * ObjID)
-//{   
-//    DEF_SKIN_OBJECT_PARAMS prm={0};
-//    prm.defColor=DEFAULT_BKCOLOUR;
-//    prm.defStyle=DEFAULT_STYLE;
-//    prm.szObjectID=ObjID;   
-//    return CallService(MS_SKIN_REGISTERDEFOBJECT,(WPARAM)&prm,0);
-//}
-static BOOL __inline ScreenToClientRect(HWND hWnd, LPRECT lpRect)
-{
-	BOOL ret;
-
-	POINT pt;
-
-	pt.x = lpRect->left;
-	pt.y = lpRect->top;
-
-	ret = ScreenToClient(hWnd, &pt);
-
-	if (!ret) return ret;
-
-	lpRect->left = pt.x;
-	lpRect->top = pt.y;
-
-
-	pt.x = lpRect->right;
-	pt.y = lpRect->bottom;
-
-	ret = ScreenToClient(hWnd, &pt);
-
-	lpRect->right = pt.x;
-	lpRect->bottom = pt.y;
-
-	return ret;
-}
-
-//int __inline CreateGlyphedObjectDefStyle(char * ObjID,BYTE defStyle)
-//{
-//    DEF_SKIN_OBJECT_PARAMS prm={0};
-//    prm.defColor=DEFAULT_BKCOLOUR;
-//    prm.defStyle=defStyle;
-//    prm.szObjectID=ObjID;
-//    return CallService(MS_SKIN_REGISTERDEFOBJECT,(WPARAM)&prm,0);
-//}  
-//int __inline CreateGlyphedObjectDefColor(char * ObjID,DWORD defColor)
-//{
-//    DEF_SKIN_OBJECT_PARAMS prm={0};
-//    prm.defColor=defColor;
-//    prm.defStyle=ST_BRUSH;
-//    prm.szObjectID=ObjID;
-//    return CallService(MS_SKIN_REGISTERDEFOBJECT,(WPARAM)&prm,0);
-//}  
-int ske_Service_DrawGlyph(WPARAM wParam,LPARAM lParam);
-int __inline SkinDrawGlyph(HDC hdc, RECT * rcSize, RECT * rcClip, char * objectID)
-{
-  SKINDRAWREQUEST rq;
-  if (!objectID) return 0;
-  rq.hDC=hdc;
-  rq.rcDestRect=*rcSize;
-  rq.rcClipRect=*rcClip;  
-  strncpy(rq.szObjectID,objectID,sizeof(rq.szObjectID));
-  return ske_Service_DrawGlyph((WPARAM)&rq,0);
-  //return CallService(MS_SKIN_DRAWGLYPH,(WPARAM)&rq,0);
-}
-//#include "../hdr/modern_skin_selector.h"
-
-//////////////////////////////////////////////
-//                                          //
-//  New Painting sequence servises          //
-//                                          //
-//////////////////////////////////////////////
-
-typedef struct sPAINT_REQUEST
-{
-  DWORD dStructSize;      //size of structure
-  HWND  hWnd;             //called by window
-  HDC   hDC;              //context to draw on
-  RECT  rcUpdate;         //rectangle to be painted in (relative to Top-Left corner of Main window)
-  DWORD dwFlags;          //drawing flags
-  void * CallbackData;    //Data for passing to callback procedure
-  char Reserved[16];      //reserved for farther usage;
-} sPaintRequest;
-
-// Request to register sub for callback painting frame area
-// wParam = hWnd of called frame
-// lParam = pointer to tPaintCallBackProc    (or NULL to remove)
-// return 1 - succes, 0 - failure
-#define MS_SKINENG_REGISTERPAINTSUB "SkinEngine/ske_Service_RegisterFramePaintCallbackProcedure"
-
-// Request to repaint frame or change/drop callback data immeadeately
-// wParam = hWnd of called frame
-// lParam = pointer to sPaintRequest (or NULL to redraw all)
-#define MS_SKINENG_UPTATEFRAMEIMAGE "SkinEngine/ske_Service_UpdateFrameImage"
-
-// Request to repaint frame or change/drop callback data
-// wParam = hWnd of called frame
-// lParam = pointer to sPaintRequest (or NULL to redraw all)
-// return 2 - already queued, data updated, 1-have been queued, 0 - failure
-#define MS_SKINENG_INVALIDATEFRAMEIMAGE "SkinEngine/ske_Service_InvalidateFrameImage"
-
-// Callback proc type
-typedef int (/*__stdcall*/ *tPaintCallbackProc)(HWND hWnd, HDC hDC, RECT * rcPaint, HRGN rgnUpdate, DWORD dFlags, void * CallBackData);
-//tPaintCallbackProc PaintCallbackProc;
-
-// HELPER TO UPDATEIMAGEFRAME
-
-int __inline SkinEngUpdateImageFrame(HWND hwnd, RECT * rcUpdate, DWORD dwFlags, void * CallBackData)
-{
-  sPaintRequest sr={0};
-  sr.dStructSize=sizeof(sPaintRequest);
-  sr.hWnd=hwnd;
-  if (rcUpdate)
-    sr.rcUpdate=*rcUpdate;
-  sr.dwFlags=dwFlags;
-  sr.CallbackData=CallBackData;
-  return CallService(MS_SKINENG_UPTATEFRAMEIMAGE,(WPARAM)hwnd,(LPARAM)&sr);
-}
-/*
-int __inline SkinEngInvalidateImageFrame(HWND hwnd, CONST RECT * rcUpdate, DWORD dwFlags, void * CallBackData)
-{
-  sPaintRequest sr={0};
-  if (hwnd && (!g_CluiData.fLayered)) return InvalidateRect(hwnd,rcUpdate,dwFlags);
-  sr.dStructSize=sizeof(sPaintRequest);
-  sr.hWnd=hwnd;
-  if (rcUpdate)
-    sr.rcUpdate=*rcUpdate;
-  sr.dwFlags=dwFlags;
-  sr.CallbackData=CallBackData;
-  return CallService(MS_SKINENG_INVALIDATEFRAMEIMAGE,(WPARAM)hwnd,(LPARAM)&sr);
-}
-
-
-int __inline SkinInvalidateFrame(HWND hWnd, CONST RECT* lpRect,BOOL bErase)
-{
-	return SkinEngInvalidateImageFrame(hWnd,lpRect,0,0);
-}
-*/
-// Alpha channel GDI replacements/helpers
-
-// 
-// Paints text with correct alpha channel
-// wParam - pointer to AlphaTextOutParams
-#define MS_SKINENG_ALPHATEXTOUT "SkinEngine/ske_AlphaTextOut"
-typedef struct _AlphaTextOutParams
-{
-  HDC hDC;
-  LPCTSTR lpString;
-  int nCount;
-  RECT * lpRect;
-  UINT format;
-  DWORD ARGBcolor;
-  char reserv[16];
-}AlphaTextOutParams;
-
-int __inline AlphaText(HDC hDC, LPCTSTR lpString, int nCount, RECT * lpRect, UINT format, DWORD ARGBcolor)
-{
-  AlphaTextOutParams ap={0};
-  ap.hDC=hDC;
-  ap.lpString=lpString;
-  ap.nCount=nCount;
-  ap.lpRect=lpRect;
-  ap.format=format;
-  ap.ARGBcolor=ARGBcolor;
-  return CallService(MS_SKINENG_ALPHATEXTOUT,(WPARAM)&ap,0);
-}
-
-typedef struct _ImageListFixParam
-{
-  HIMAGELIST himl;
-  int index;
-  HICON hicon;
-}ImageListFixParam;
-
-typedef struct _DrawIconFixParam
-{
-  HDC hdc;
-  int xLeft;
-  int yTop;
-  HICON hIcon;
-  int cxWidth;
-  int cyWidth; 
-  UINT istepIfAniCur; 
-  HBRUSH hbrFlickerFreeDraw;
-  UINT diFlags;
-} DrawIconFixParam;
-//wParam - pointer to DrawIconFixParam
-#define MS_SKINENG_DRAWICONEXFIX "SkinEngine/DrawIconEx_Fix"
-
-int __inline mod_DrawIconEx_helper(HDC hdc,int xLeft,int yTop,HICON hIcon,int cxWidth,int cyWidth, UINT istepIfAniCur, HBRUSH hbrFlickerFreeDraw, UINT diFlags)
-{
-  DrawIconFixParam p={0};
-  p.hdc=hdc;
-  p.xLeft=xLeft;
-  p.yTop=yTop;
-  p.hIcon=hIcon;
-  p.cxWidth=cxWidth;
-  p.cyWidth=cyWidth;
-  p.istepIfAniCur=istepIfAniCur;
-  p.hbrFlickerFreeDraw=hbrFlickerFreeDraw;
-  p.diFlags=diFlags;
-  return CallService(MS_SKINENG_DRAWICONEXFIX,(WPARAM)&p,0);
-}
-#endif
diff --git a/protocols/Omegle/omegle_10.vcxproj b/protocols/Omegle/omegle_10.vcxproj
index a31b25bd38..e44db90faa 100644
--- a/protocols/Omegle/omegle_10.vcxproj
+++ b/protocols/Omegle/omegle_10.vcxproj
@@ -19,7 +19,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{DADE9455-DC28-465A-9604-2CA28052B9FB}</ProjectGuid>
+    <ProjectGuid>{D5E2FEC1-B29A-476C-BD41-469FE282EE0F}</ProjectGuid>
     <RootNamespace>omegle</RootNamespace>
     <Keyword>Win32Proj</Keyword>
     <ProjectName>Omegle</ProjectName>
@@ -95,8 +95,8 @@
     <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IncludePath)</IncludePath>
     <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IncludePath)</IncludePath>
     <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IncludePath)</IncludePath>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <PreBuildEvent>
diff --git a/protocols/Omegle/omegle_icons_10.vcxproj b/protocols/Omegle/omegle_icons_10.vcxproj
index f44d5ac8c7..55cd12cfc3 100644
--- a/protocols/Omegle/omegle_icons_10.vcxproj
+++ b/protocols/Omegle/omegle_icons_10.vcxproj
@@ -60,14 +60,14 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Icons\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)\Icons\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Icons\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)\Icons\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform) $(Configuration)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform) $(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)/Icons\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64/Icons\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)/Obj/$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)/Icons\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64/Icons\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)/Obj/$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -79,7 +79,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -92,7 +92,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">