TabSRMM: folders restructurization

git-svn-id: http://svn.miranda-ng.org/main/trunk@1923 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

230 files changed, 528 insertions, 1464 deletions

diff --git a/plugins/TabSRMM/icons/ICONS_NOVA/ICONS_NOVA_10.vcxproj b/plugins/TabSRMM/TabSRMM_icons/NOVA/ICONS_NOVA_10.vcxproj
index 99e3562966..27470f1a43 100644
--- a/plugins/TabSRMM/icons/ICONS_NOVA/ICONS_NOVA_10.vcxproj
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/ICONS_NOVA_10.vcxproj
@@ -116,10 +116,10 @@
     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ClInclude Include="..\ICONSXP\resource.h" />

+    <ClInclude Include="..\resource.h" />

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="ICONS_NOVA.rc" />

+    <ResourceCompile Include="res\ICONS_NOVA.rc" />

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/TabSRMM/icons/ICONS_NOVA/ICONS_NOVA_10.vcxproj.filters b/plugins/TabSRMM/TabSRMM_icons/NOVA/ICONS_NOVA_10.vcxproj.filters
index 3eb80668f3..3da2b78840 100644
--- a/plugins/TabSRMM/icons/ICONS_NOVA/ICONS_NOVA_10.vcxproj.filters
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/ICONS_NOVA_10.vcxproj.filters
@@ -11,12 +11,12 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="..\ICONSXP\resource.h">

+    <ClInclude Include="..\resource.h">

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="ICONS_NOVA.rc">

+    <ResourceCompile Include="res\ICONS_NOVA.rc">

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

diff --git a/plugins/TabSRMM/res/NOVA/Font2.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/Font2.ico
index 0accc238f5..0accc238f5 100644
--- a/plugins/TabSRMM/res/NOVA/Font2.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/Font2.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/ICONS_NOVA.rc b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/ICONS_NOVA.rc
new file mode 100644
index 0000000000..4b819348ad
--- /dev/null
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/ICONS_NOVA.rc
@@ -0,0 +1,179 @@
+// Microsoft Visual C++ generated resource script.

+//

+

+#include "..\..\resource.h"

+

+#define APSTUDIO_READONLY_SYMBOLS

+/////////////////////////////////////////////////////////////////////////////

+//

+// Generated from the TEXTINCLUDE 2 resource.

+//

+#include "winres.h"

+

+/////////////////////////////////////////////////////////////////////////////

+#undef APSTUDIO_READONLY_SYMBOLS

+

+/////////////////////////////////////////////////////////////////////////////

+// German (Germany) resources

+

+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU)

+#ifdef _WIN32

+LANGUAGE LANG_GERMAN, SUBLANG_GERMAN

+#pragma code_page(1252)

+#endif //_WIN32

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Icon

+//

+

+// Icon with lowest ID value placed first to ensure application icon

+// remains consistent on all systems.

+IDI_IMAGETAG            ICON                    "..\\..\\imgopen.ico"

+IDI_PULLDOWNARROW       ICON                    "..\\..\\pulldown.ico"

+IDI_LEFTARROW           ICON                    "..\\..\\leftarrow.ico"

+IDI_PULLUPARROW         ICON                    "..\\..\\pullup.ico"

+IDI_RIGHTARROW          ICON                    "..\\..\\rightarrow.ico"

+

+IDI_TRAYANIM1           ICON                    "..\\..\\MessAnim\\m1.ico"

+IDI_TRAYANIM2           ICON                    "..\\..\\MessAnim\\m2.ico"

+IDI_TRAYANIM3           ICON                    "..\\..\\MessAnim\\m3.ico"

+IDI_TRAYANIM4           ICON                    "..\\..\\MessAnim\\m4.ico"

+

+IDI_HISTORY             ICON                    "history.ico"

+IDI_MSGLOGOPT           ICON                    "options.ico"

+IDI_ADDCONTACT          ICON                    "plus.ico"

+IDI_MULTISEND           ICON                    "multisend.ico"

+IDI_TYPING              ICON                    "pencil.ico"

+IDI_QUOTE               ICON                    "quote.ico"

+IDI_SAVE                ICON                    "file.ico"

+IDI_SEND                ICON                    "check.ico"

+IDI_CONTACTPIC          ICON                    "avatar.ico"

+IDI_USERMENU            ICON                    "info.ico"

+IDI_MSGERROR            ICON                    "block.ico"

+IDI_CLOSEMSGDLG         ICON                    "delete.ico"

+IDI_CLOCK               ICON                    "clock.ico"

+IDI_ICONIN              ICON                    "Incom.ico"

+IDI_ICONOUT             ICON                    "outg.ico"

+IDI_SMILEYICON          ICON                    "emoticon.ico"

+IDI_SELFTYPING_ON       ICON                    "mtn.ico"

+IDI_SELFTYPING_OFF      ICON                    "nomtn.ico"

+IDI_CONTAINER           ICON                    "message.ico"

+IDI_SECUREIM_ENABLED    ICON                    "secureOn.ico"

+IDI_SECUREIM_DISABLED   ICON                    "secureOff.ico"

+IDI_STATUSCHANGE        ICON                    "Status change.ico"

+IDI_FONTBOLD            ICON                    "bold.ico"

+IDI_FONTITALIC          ICON                    "italic.ico"

+IDI_FONTUNDERLINE       ICON                    "underline.ico"

+IDI_STRIKEOUT           ICON                    "strike.ico"

+IDI_FONTFACE            ICON                    "font.ico"

+IDI_FONTCOLOR           ICON                    "font2.ico"

+IDI_SOUNDSON            ICON                    "sounds_on.ico"

+IDI_SESSIONLIST         ICON                    "slist.ico"

+IDI_CONFIGSIDEBAR       ICON                    "sbaroptions.ico"

+IDI_RECENTLIST          ICON                    "recentlist.ico"

+IDI_USERPREFS           ICON                    "userprefs.ico"

+

+IDI_TAG1                ICON                    "chat\\tag1.ico"

+IDI_TAG2                ICON                    "chat\\tag2.ico"

+IDI_TOPICBUT            ICON                    "chat\\topicbut.ico"

+IDI_JOIN                ICON                    "chat\\join.ico"

+IDI_TOPIC               ICON                    "chat\\topic.ico"

+IDI_ADDSTATUS           ICON                    "chat\\addmode.ico"

+IDI_INFO                ICON                    "chat\\info.ico"

+IDI_KICK                ICON                    "chat\\kick.ico"

+IDI_MESSAGE             ICON                    "chat\\message.ico"

+IDI_NICK                ICON                    "chat\\nick.ico"

+IDI_NOTICE              ICON                    "chat\\notice.ico"

+IDI_PART                ICON                    "chat\\part.ico"

+IDI_QUIT                ICON                    "chat\\quit.ico"

+IDI_REMSTATUS           ICON                    "chat\\removestatus.ico"

+IDI_HIGHLIGHT           ICON                    "chat\\highlight.ico"

+IDI_MESSAGEOUT          ICON                    "chat\\messageout.ico"

+IDI_ACTION              ICON                    "chat\\action.ico"

+IDI_BKGCOLOR            ICON                    "chat\\bkgcolor.ico"

+IDI_CHANMGR             ICON                    "chat\\window.ico"

+IDI_FILTER              ICON                    "chat\\filter.ico"

+IDI_BLANK               ICON                    "chat\\blank.ico"

+IDI_STATUS3             ICON                    "chat\\4.ico"

+IDI_STATUS2             ICON                    "chat\\3.ico"

+IDI_STATUS4             ICON                    "chat\\5.ico"

+IDI_STATUS1             ICON                    "chat\\2.ico"

+IDI_STATUS0             ICON                    "chat\\blank.ico"

+IDI_STATUS5             ICON                    "chat\\6.ico"

+IDI_OVERLAY             ICON                    "chat\\overlay.ico"

+IDI_FILTER2             ICON                    "chat\\filter2.ico"

+IDI_SHOWNICKLIST        ICON                    "chat\\nicklist_show.ico"

+IDI_HIDENICKLIST        ICON                    "chat\\nicklist_hide.ico"

+

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Bitmap

+//

+

+IDB_UNKNOWNAVATAR       BITMAP                  "..\\..\\unknown.bmp"

+

+#ifdef APSTUDIO_INVOKED

+/////////////////////////////////////////////////////////////////////////////

+//

+// TEXTINCLUDE

+//

+

+1 TEXTINCLUDE 

+BEGIN

+    "..\\..\\resource.h\0"

+END

+

+2 TEXTINCLUDE 

+BEGIN

+    "#include ""afxres.h""\r\n"

+    "\0"

+END

+

+3 TEXTINCLUDE 

+BEGIN

+    "\r\n"

+    "\0"

+END

+

+#endif    // APSTUDIO_INVOKED

+

+#endif    // German (Germany) resources

+/////////////////////////////////////////////////////////////////////////////

+

+

+/////////////////////////////////////////////////////////////////////////////

+// German (Austria) resources

+

+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEA)

+#ifdef _WIN32

+LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_AUSTRIAN

+#pragma code_page(1252)

+#endif //_WIN32

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// String Table

+//

+

+STRINGTABLE 

+BEGIN

+    IDS_IDENTIFY            "__tabSRMM_ICONPACK 5.0__"

+END

+

+#endif    // German (Austria) resources

+/////////////////////////////////////////////////////////////////////////////

+

+

+

+#ifndef APSTUDIO_INVOKED

+/////////////////////////////////////////////////////////////////////////////

+//

+// Generated from the TEXTINCLUDE 3 resource.

+//

+

+

+/////////////////////////////////////////////////////////////////////////////

+#endif    // not APSTUDIO_INVOKED

+

diff --git a/plugins/TabSRMM/res/NOVA/Incom.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/Incom.ico
index 19957e4ac8..19957e4ac8 100644
--- a/plugins/TabSRMM/res/NOVA/Incom.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/Incom.ico
diff --git a/plugins/TabSRMM/res/NOVA/Outg.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/Outg.ico
index 637196b745..637196b745 100644
--- a/plugins/TabSRMM/res/NOVA/Outg.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/Outg.ico
diff --git a/plugins/TabSRMM/res/NOVA/Status change.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/Status change.ico
index 8bfe42bf39..8bfe42bf39 100644
--- a/plugins/TabSRMM/res/NOVA/Status change.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/Status change.ico
diff --git a/plugins/TabSRMM/res/NOVA/avatar.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/avatar.ico
index cad68be597..cad68be597 100644
--- a/plugins/TabSRMM/res/NOVA/avatar.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/avatar.ico
diff --git a/plugins/TabSRMM/res/NOVA/block.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/block.ico
index bdb0086c5b..bdb0086c5b 100644
--- a/plugins/TabSRMM/res/NOVA/block.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/block.ico
diff --git a/plugins/TabSRMM/res/NOVA/bold.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/bold.ico
index fc34113b6b..fc34113b6b 100644
--- a/plugins/TabSRMM/res/NOVA/bold.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/bold.ico
diff --git a/plugins/TabSRMM/chat/Icons/NOVA/2.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/2.ico
index 819ecc1d7a..819ecc1d7a 100644
--- a/plugins/TabSRMM/chat/Icons/NOVA/2.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/2.ico
diff --git a/plugins/TabSRMM/chat/Icons/NOVA/3.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/3.ico
index 0928e257fe..0928e257fe 100644
--- a/plugins/TabSRMM/chat/Icons/NOVA/3.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/3.ico
diff --git a/plugins/TabSRMM/chat/Icons/NOVA/4.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/4.ico
index 5dcea114fa..5dcea114fa 100644
--- a/plugins/TabSRMM/chat/Icons/NOVA/4.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/4.ico
diff --git a/plugins/TabSRMM/chat/Icons/NOVA/5.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/5.ico
index 6aa5806c53..6aa5806c53 100644
--- a/plugins/TabSRMM/chat/Icons/NOVA/5.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/5.ico
diff --git a/plugins/TabSRMM/chat/Icons/NOVA/6.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/6.ico
index c35cc39ebc..c35cc39ebc 100644
--- a/plugins/TabSRMM/chat/Icons/NOVA/6.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/6.ico
diff --git a/plugins/TabSRMM/chat/Icons/NOVA/Bkgcolor.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/Bkgcolor.ico
index e3322ef34b..e3322ef34b 100644
--- a/plugins/TabSRMM/chat/Icons/NOVA/Bkgcolor.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/Bkgcolor.ico
diff --git a/plugins/TabSRMM/chat/Icons/NOVA/action.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/action.ico
index 44816c42d7..44816c42d7 100644
--- a/plugins/TabSRMM/chat/Icons/NOVA/action.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/action.ico
diff --git a/plugins/TabSRMM/chat/Icons/NOVA/addmode.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/addmode.ico
index a6a7e6f38c..a6a7e6f38c 100644
--- a/plugins/TabSRMM/chat/Icons/NOVA/addmode.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/addmode.ico
diff --git a/plugins/TabSRMM/chat/Icons/NOVA/blank.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/blank.ico
index 7845f62fed..7845f62fed 100644
--- a/plugins/TabSRMM/chat/Icons/NOVA/blank.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/blank.ico
diff --git a/plugins/TabSRMM/chat/Icons/NOVA/filter.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/filter.ico
index 7c99edb58c..7c99edb58c 100644
--- a/plugins/TabSRMM/chat/Icons/NOVA/filter.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/filter.ico
diff --git a/plugins/TabSRMM/chat/Icons/NOVA/filter2.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/filter2.ico
index 701890522b..701890522b 100644
--- a/plugins/TabSRMM/chat/Icons/NOVA/filter2.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/filter2.ico
diff --git a/plugins/TabSRMM/chat/Icons/NOVA/highlight.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/highlight.ico
index 552c912eaa..552c912eaa 100644
--- a/plugins/TabSRMM/chat/Icons/NOVA/highlight.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/highlight.ico
diff --git a/plugins/TabSRMM/chat/Icons/NOVA/history.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/history.ico
index 537c9b52c5..537c9b52c5 100644
--- a/plugins/TabSRMM/chat/Icons/NOVA/history.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/history.ico
diff --git a/plugins/TabSRMM/chat/Icons/NOVA/info.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/info.ico
index 1acdb7190b..1acdb7190b 100644
--- a/plugins/TabSRMM/chat/Icons/NOVA/info.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/info.ico
diff --git a/plugins/TabSRMM/chat/Icons/NOVA/join.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/join.ico
index 151cd93211..151cd93211 100644
--- a/plugins/TabSRMM/chat/Icons/NOVA/join.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/join.ico
diff --git a/plugins/TabSRMM/chat/Icons/NOVA/kick.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/kick.ico
index c93e92dd77..c93e92dd77 100644
--- a/plugins/TabSRMM/chat/Icons/NOVA/kick.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/kick.ico
diff --git a/plugins/TabSRMM/chat/Icons/NOVA/message.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/message.ico
index 19957e4ac8..19957e4ac8 100644
--- a/plugins/TabSRMM/chat/Icons/NOVA/message.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/message.ico
diff --git a/plugins/TabSRMM/chat/Icons/NOVA/messageout.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/messageout.ico
index 637196b745..637196b745 100644
--- a/plugins/TabSRMM/chat/Icons/NOVA/messageout.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/messageout.ico
diff --git a/plugins/TabSRMM/chat/Icons/NOVA/nick.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/nick.ico
index 3f199ffd50..3f199ffd50 100644
--- a/plugins/TabSRMM/chat/Icons/NOVA/nick.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/nick.ico
diff --git a/plugins/TabSRMM/chat/Icons/NOVA/nicklist_hide.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/nicklist_hide.ico
index f2f611d6a4..f2f611d6a4 100644
--- a/plugins/TabSRMM/chat/Icons/NOVA/nicklist_hide.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/nicklist_hide.ico
diff --git a/plugins/TabSRMM/chat/Icons/NOVA/nicklist_show.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/nicklist_show.ico
index cba204fe5e..cba204fe5e 100644
--- a/plugins/TabSRMM/chat/Icons/NOVA/nicklist_show.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/nicklist_show.ico
diff --git a/plugins/TabSRMM/chat/Icons/NOVA/notice.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/notice.ico
index 1ba34d7244..1ba34d7244 100644
--- a/plugins/TabSRMM/chat/Icons/NOVA/notice.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/notice.ico
diff --git a/plugins/TabSRMM/chat/Icons/NOVA/overlay.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/overlay.ico
index 28742d898d..28742d898d 100644
--- a/plugins/TabSRMM/chat/Icons/NOVA/overlay.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/overlay.ico
diff --git a/plugins/TabSRMM/chat/Icons/NOVA/part.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/part.ico
index 39c24868aa..39c24868aa 100644
--- a/plugins/TabSRMM/chat/Icons/NOVA/part.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/part.ico
diff --git a/plugins/TabSRMM/chat/Icons/NOVA/quit.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/quit.ico
index d7fbdaf4b7..d7fbdaf4b7 100644
--- a/plugins/TabSRMM/chat/Icons/NOVA/quit.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/quit.ico
diff --git a/plugins/TabSRMM/chat/Icons/NOVA/removestatus.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/removestatus.ico
index ea3cef3fef..ea3cef3fef 100644
--- a/plugins/TabSRMM/chat/Icons/NOVA/removestatus.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/removestatus.ico
diff --git a/plugins/TabSRMM/chat/Icons/NOVA/tag1.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/tag1.ico
index 1dc687becd..1dc687becd 100644
--- a/plugins/TabSRMM/chat/Icons/NOVA/tag1.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/tag1.ico
diff --git a/plugins/TabSRMM/chat/Icons/NOVA/tag2.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/tag2.ico
index 4fac50a4c8..4fac50a4c8 100644
--- a/plugins/TabSRMM/chat/Icons/NOVA/tag2.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/tag2.ico
diff --git a/plugins/TabSRMM/chat/Icons/NOVA/topic.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/topic.ico
index e4bb7da7e0..e4bb7da7e0 100644
--- a/plugins/TabSRMM/chat/Icons/NOVA/topic.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/topic.ico
diff --git a/plugins/TabSRMM/chat/Icons/NOVA/topicbut.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/topicbut.ico
index ddb72fb8ca..ddb72fb8ca 100644
--- a/plugins/TabSRMM/chat/Icons/NOVA/topicbut.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/topicbut.ico
diff --git a/plugins/TabSRMM/chat/Icons/NOVA/window.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/window.ico
index 5c21ea3052..5c21ea3052 100644
--- a/plugins/TabSRMM/chat/Icons/NOVA/window.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/chat/window.ico
diff --git a/plugins/TabSRMM/res/NOVA/check.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/check.ico
index 9649501087..9649501087 100644
--- a/plugins/TabSRMM/res/NOVA/check.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/check.ico
diff --git a/plugins/TabSRMM/res/NOVA/clock.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/clock.ico
index 6ae180c48f..6ae180c48f 100644
--- a/plugins/TabSRMM/res/NOVA/clock.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/clock.ico
diff --git a/plugins/TabSRMM/res/NOVA/delete.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/delete.ico
index 6e39da592b..6e39da592b 100644
--- a/plugins/TabSRMM/res/NOVA/delete.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/delete.ico
diff --git a/plugins/TabSRMM/res/NOVA/emoticon.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/emoticon.ico
index e0d066ce33..e0d066ce33 100644
--- a/plugins/TabSRMM/res/NOVA/emoticon.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/emoticon.ico
diff --git a/plugins/TabSRMM/res/NOVA/file.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/file.ico
index fadf04c4da..fadf04c4da 100644
--- a/plugins/TabSRMM/res/NOVA/file.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/file.ico
diff --git a/plugins/TabSRMM/res/NOVA/font.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/font.ico
index ce8272a715..ce8272a715 100644
--- a/plugins/TabSRMM/res/NOVA/font.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/font.ico
diff --git a/plugins/TabSRMM/res/NOVA/history.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/history.ico
index e757b93e54..e757b93e54 100644
--- a/plugins/TabSRMM/res/NOVA/history.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/history.ico
diff --git a/plugins/TabSRMM/res/NOVA/info.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/info.ico
index 715b7a1bec..715b7a1bec 100644
--- a/plugins/TabSRMM/res/NOVA/info.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/info.ico
diff --git a/plugins/TabSRMM/res/NOVA/italic.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/italic.ico
index 5c61422a71..5c61422a71 100644
--- a/plugins/TabSRMM/res/NOVA/italic.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/italic.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/NOVA/res/message.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/message.ico
new file mode 100644
index 0000000000..92f2b6cbfe
--- /dev/null
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/message.ico
diff --git a/plugins/TabSRMM/res/NOVA/mtn.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/mtn.ico
index f50625f7c7..f50625f7c7 100644
--- a/plugins/TabSRMM/res/NOVA/mtn.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/mtn.ico
diff --git a/plugins/TabSRMM/res/NOVA/multisend.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/multisend.ico
index 8f15a489f0..8f15a489f0 100644
--- a/plugins/TabSRMM/res/NOVA/multisend.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/multisend.ico
diff --git a/plugins/TabSRMM/res/NOVA/nomtn.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/nomtn.ico
index 0f398a2ae6..0f398a2ae6 100644
--- a/plugins/TabSRMM/res/NOVA/nomtn.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/nomtn.ico
diff --git a/plugins/TabSRMM/res/NOVA/options.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/options.ico
index ddb72fb8ca..ddb72fb8ca 100644
--- a/plugins/TabSRMM/res/NOVA/options.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/options.ico
diff --git a/plugins/TabSRMM/res/NOVA/pencil.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/pencil.ico
index a2dcf7fd17..a2dcf7fd17 100644
--- a/plugins/TabSRMM/res/NOVA/pencil.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/pencil.ico
diff --git a/plugins/TabSRMM/res/NOVA/plus.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/plus.ico
index a6a7e6f38c..a6a7e6f38c 100644
--- a/plugins/TabSRMM/res/NOVA/plus.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/plus.ico
diff --git a/plugins/TabSRMM/res/NOVA/quote.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/quote.ico
index 7e0a596ddc..7e0a596ddc 100644
--- a/plugins/TabSRMM/res/NOVA/quote.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/quote.ico
diff --git a/plugins/TabSRMM/res/NOVA/recentlist.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/recentlist.ico
index 9e4c60d9d3..9e4c60d9d3 100644
--- a/plugins/TabSRMM/res/NOVA/recentlist.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/recentlist.ico
diff --git a/plugins/TabSRMM/res/NOVA/sbaroptions.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/sbaroptions.ico
index 0693dd7f27..0693dd7f27 100644
--- a/plugins/TabSRMM/res/NOVA/sbaroptions.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/sbaroptions.ico
diff --git a/plugins/TabSRMM/res/NOVA/secureOff.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/secureOff.ico
index e47cde2a31..e47cde2a31 100644
--- a/plugins/TabSRMM/res/NOVA/secureOff.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/secureOff.ico
diff --git a/plugins/TabSRMM/res/NOVA/secureon.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/secureon.ico
index 9db93af58c..9db93af58c 100644
--- a/plugins/TabSRMM/res/NOVA/secureon.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/secureon.ico
diff --git a/plugins/TabSRMM/res/NOVA/slist.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/slist.ico
index 86139d5e23..86139d5e23 100644
--- a/plugins/TabSRMM/res/NOVA/slist.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/slist.ico
diff --git a/plugins/TabSRMM/res/NOVA/sounds_off.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/sounds_off.ico
index a4d8f9093d..a4d8f9093d 100644
--- a/plugins/TabSRMM/res/NOVA/sounds_off.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/sounds_off.ico
diff --git a/plugins/TabSRMM/res/NOVA/sounds_on.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/sounds_on.ico
index f27798f6ed..f27798f6ed 100644
--- a/plugins/TabSRMM/res/NOVA/sounds_on.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/sounds_on.ico
diff --git a/plugins/TabSRMM/res/NOVA/strike.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/strike.ico
index 6ecace8a51..6ecace8a51 100644
--- a/plugins/TabSRMM/res/NOVA/strike.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/strike.ico
diff --git a/plugins/TabSRMM/res/NOVA/underline.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/underline.ico
index 01cf64a36a..01cf64a36a 100644
--- a/plugins/TabSRMM/res/NOVA/underline.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/underline.ico
diff --git a/plugins/TabSRMM/res/NOVA/userprefs.ico b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/userprefs.ico
index 7028f10d03..7028f10d03 100644
--- a/plugins/TabSRMM/res/NOVA/userprefs.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/NOVA/res/userprefs.ico
diff --git a/plugins/TabSRMM/icons/ICONSXP/iconsxp_10.vcxproj b/plugins/TabSRMM/TabSRMM_icons/XP/iconsxp_10.vcxproj
index 2925ed9220..6922ceabf2 100644
--- a/plugins/TabSRMM/icons/ICONSXP/iconsxp_10.vcxproj
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/iconsxp_10.vcxproj
@@ -117,10 +117,10 @@
     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ClInclude Include="resource.h" />

+    <ClInclude Include="..\resource.h" />

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="ICONSXP.rc" />

+    <ResourceCompile Include="res\ICONSXP.rc" />

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/TabSRMM/icons/ICONSXP/iconsxp_10.vcxproj.filters b/plugins/TabSRMM/TabSRMM_icons/XP/iconsxp_10.vcxproj.filters
index c0afa0256c..092e761f09 100644
--- a/plugins/TabSRMM/icons/ICONSXP/iconsxp_10.vcxproj.filters
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/iconsxp_10.vcxproj.filters
@@ -1,27 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>

 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <ItemGroup>

-    <Filter Include="Quelldateien">

-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>

-      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>

-    </Filter>

-    <Filter Include="Headerdateien">

+    <Filter Include="Header Files">

       <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>

       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>

     </Filter>

-    <Filter Include="Ressourcendateien">

+    <Filter Include="Resource Files">

       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>

       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>

     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="resource.h">

-      <Filter>Headerdateien</Filter>

+    <ClInclude Include="..\resource.h">

+      <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="ICONSXP.rc">

-      <Filter>Ressourcendateien</Filter>

+    <ResourceCompile Include="res\ICONSXP.rc">

+      <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/plugins/TabSRMM/res/proxal/Font2.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/Font2.ico
index 40ba164cfe..40ba164cfe 100644
--- a/plugins/TabSRMM/res/proxal/Font2.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/Font2.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/XP/res/ICONSXP.rc b/plugins/TabSRMM/TabSRMM_icons/XP/res/ICONSXP.rc
new file mode 100644
index 0000000000..4b819348ad
--- /dev/null
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/ICONSXP.rc
@@ -0,0 +1,179 @@
+// Microsoft Visual C++ generated resource script.

+//

+

+#include "..\..\resource.h"

+

+#define APSTUDIO_READONLY_SYMBOLS

+/////////////////////////////////////////////////////////////////////////////

+//

+// Generated from the TEXTINCLUDE 2 resource.

+//

+#include "winres.h"

+

+/////////////////////////////////////////////////////////////////////////////

+#undef APSTUDIO_READONLY_SYMBOLS

+

+/////////////////////////////////////////////////////////////////////////////

+// German (Germany) resources

+

+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU)

+#ifdef _WIN32

+LANGUAGE LANG_GERMAN, SUBLANG_GERMAN

+#pragma code_page(1252)

+#endif //_WIN32

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Icon

+//

+

+// Icon with lowest ID value placed first to ensure application icon

+// remains consistent on all systems.

+IDI_IMAGETAG            ICON                    "..\\..\\imgopen.ico"

+IDI_PULLDOWNARROW       ICON                    "..\\..\\pulldown.ico"

+IDI_LEFTARROW           ICON                    "..\\..\\leftarrow.ico"

+IDI_PULLUPARROW         ICON                    "..\\..\\pullup.ico"

+IDI_RIGHTARROW          ICON                    "..\\..\\rightarrow.ico"

+

+IDI_TRAYANIM1           ICON                    "..\\..\\MessAnim\\m1.ico"

+IDI_TRAYANIM2           ICON                    "..\\..\\MessAnim\\m2.ico"

+IDI_TRAYANIM3           ICON                    "..\\..\\MessAnim\\m3.ico"

+IDI_TRAYANIM4           ICON                    "..\\..\\MessAnim\\m4.ico"

+

+IDI_HISTORY             ICON                    "history.ico"

+IDI_MSGLOGOPT           ICON                    "options.ico"

+IDI_ADDCONTACT          ICON                    "plus.ico"

+IDI_MULTISEND           ICON                    "multisend.ico"

+IDI_TYPING              ICON                    "pencil.ico"

+IDI_QUOTE               ICON                    "quote.ico"

+IDI_SAVE                ICON                    "file.ico"

+IDI_SEND                ICON                    "check.ico"

+IDI_CONTACTPIC          ICON                    "avatar.ico"

+IDI_USERMENU            ICON                    "info.ico"

+IDI_MSGERROR            ICON                    "block.ico"

+IDI_CLOSEMSGDLG         ICON                    "delete.ico"

+IDI_CLOCK               ICON                    "clock.ico"

+IDI_ICONIN              ICON                    "Incom.ico"

+IDI_ICONOUT             ICON                    "outg.ico"

+IDI_SMILEYICON          ICON                    "emoticon.ico"

+IDI_SELFTYPING_ON       ICON                    "mtn.ico"

+IDI_SELFTYPING_OFF      ICON                    "nomtn.ico"

+IDI_CONTAINER           ICON                    "message.ico"

+IDI_SECUREIM_ENABLED    ICON                    "secureOn.ico"

+IDI_SECUREIM_DISABLED   ICON                    "secureOff.ico"

+IDI_STATUSCHANGE        ICON                    "Status change.ico"

+IDI_FONTBOLD            ICON                    "bold.ico"

+IDI_FONTITALIC          ICON                    "italic.ico"

+IDI_FONTUNDERLINE       ICON                    "underline.ico"

+IDI_STRIKEOUT           ICON                    "strike.ico"

+IDI_FONTFACE            ICON                    "font.ico"

+IDI_FONTCOLOR           ICON                    "font2.ico"

+IDI_SOUNDSON            ICON                    "sounds_on.ico"

+IDI_SESSIONLIST         ICON                    "slist.ico"

+IDI_CONFIGSIDEBAR       ICON                    "sbaroptions.ico"

+IDI_RECENTLIST          ICON                    "recentlist.ico"

+IDI_USERPREFS           ICON                    "userprefs.ico"

+

+IDI_TAG1                ICON                    "chat\\tag1.ico"

+IDI_TAG2                ICON                    "chat\\tag2.ico"

+IDI_TOPICBUT            ICON                    "chat\\topicbut.ico"

+IDI_JOIN                ICON                    "chat\\join.ico"

+IDI_TOPIC               ICON                    "chat\\topic.ico"

+IDI_ADDSTATUS           ICON                    "chat\\addmode.ico"

+IDI_INFO                ICON                    "chat\\info.ico"

+IDI_KICK                ICON                    "chat\\kick.ico"

+IDI_MESSAGE             ICON                    "chat\\message.ico"

+IDI_NICK                ICON                    "chat\\nick.ico"

+IDI_NOTICE              ICON                    "chat\\notice.ico"

+IDI_PART                ICON                    "chat\\part.ico"

+IDI_QUIT                ICON                    "chat\\quit.ico"

+IDI_REMSTATUS           ICON                    "chat\\removestatus.ico"

+IDI_HIGHLIGHT           ICON                    "chat\\highlight.ico"

+IDI_MESSAGEOUT          ICON                    "chat\\messageout.ico"

+IDI_ACTION              ICON                    "chat\\action.ico"

+IDI_BKGCOLOR            ICON                    "chat\\bkgcolor.ico"

+IDI_CHANMGR             ICON                    "chat\\window.ico"

+IDI_FILTER              ICON                    "chat\\filter.ico"

+IDI_BLANK               ICON                    "chat\\blank.ico"

+IDI_STATUS3             ICON                    "chat\\4.ico"

+IDI_STATUS2             ICON                    "chat\\3.ico"

+IDI_STATUS4             ICON                    "chat\\5.ico"

+IDI_STATUS1             ICON                    "chat\\2.ico"

+IDI_STATUS0             ICON                    "chat\\blank.ico"

+IDI_STATUS5             ICON                    "chat\\6.ico"

+IDI_OVERLAY             ICON                    "chat\\overlay.ico"

+IDI_FILTER2             ICON                    "chat\\filter2.ico"

+IDI_SHOWNICKLIST        ICON                    "chat\\nicklist_show.ico"

+IDI_HIDENICKLIST        ICON                    "chat\\nicklist_hide.ico"

+

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// Bitmap

+//

+

+IDB_UNKNOWNAVATAR       BITMAP                  "..\\..\\unknown.bmp"

+

+#ifdef APSTUDIO_INVOKED

+/////////////////////////////////////////////////////////////////////////////

+//

+// TEXTINCLUDE

+//

+

+1 TEXTINCLUDE 

+BEGIN

+    "..\\..\\resource.h\0"

+END

+

+2 TEXTINCLUDE 

+BEGIN

+    "#include ""afxres.h""\r\n"

+    "\0"

+END

+

+3 TEXTINCLUDE 

+BEGIN

+    "\r\n"

+    "\0"

+END

+

+#endif    // APSTUDIO_INVOKED

+

+#endif    // German (Germany) resources

+/////////////////////////////////////////////////////////////////////////////

+

+

+/////////////////////////////////////////////////////////////////////////////

+// German (Austria) resources

+

+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEA)

+#ifdef _WIN32

+LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_AUSTRIAN

+#pragma code_page(1252)

+#endif //_WIN32

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// String Table

+//

+

+STRINGTABLE 

+BEGIN

+    IDS_IDENTIFY            "__tabSRMM_ICONPACK 5.0__"

+END

+

+#endif    // German (Austria) resources

+/////////////////////////////////////////////////////////////////////////////

+

+

+

+#ifndef APSTUDIO_INVOKED

+/////////////////////////////////////////////////////////////////////////////

+//

+// Generated from the TEXTINCLUDE 3 resource.

+//

+

+

+/////////////////////////////////////////////////////////////////////////////

+#endif    // not APSTUDIO_INVOKED

+

diff --git a/plugins/TabSRMM/res/proxal/Incom.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/Incom.ico
index 285cb6053b..285cb6053b 100644
--- a/plugins/TabSRMM/res/proxal/Incom.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/Incom.ico
diff --git a/plugins/TabSRMM/res/proxal/Outg.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/Outg.ico
index 5680900f59..5680900f59 100644
--- a/plugins/TabSRMM/res/proxal/Outg.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/Outg.ico
diff --git a/plugins/TabSRMM/res/proxal/Pencil.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/Pencil.ico
index 95ce9ef31c..95ce9ef31c 100644
--- a/plugins/TabSRMM/res/proxal/Pencil.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/Pencil.ico
diff --git a/plugins/TabSRMM/res/proxal/Status change.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/Status change.ico
index 6ff4abcdb6..6ff4abcdb6 100644
--- a/plugins/TabSRMM/res/proxal/Status change.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/Status change.ico
diff --git a/plugins/TabSRMM/res/proxal/avatar.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/avatar.ico
index f6ef57240b..f6ef57240b 100644
--- a/plugins/TabSRMM/res/proxal/avatar.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/avatar.ico
diff --git a/plugins/TabSRMM/res/proxal/block.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/block.ico
index e46440788a..e46440788a 100644
--- a/plugins/TabSRMM/res/proxal/block.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/block.ico
diff --git a/plugins/TabSRMM/res/proxal/bold.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/bold.ico
index 9940db4ba9..9940db4ba9 100644
--- a/plugins/TabSRMM/res/proxal/bold.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/bold.ico
diff --git a/plugins/TabSRMM/chat/Icons/2.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/2.ico
index f212c16855..f212c16855 100644
--- a/plugins/TabSRMM/chat/Icons/2.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/2.ico
diff --git a/plugins/TabSRMM/chat/Icons/3.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/3.ico
index 680cfd63e1..680cfd63e1 100644
--- a/plugins/TabSRMM/chat/Icons/3.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/3.ico
diff --git a/plugins/TabSRMM/chat/Icons/4.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/4.ico
index d39ae9ea76..d39ae9ea76 100644
--- a/plugins/TabSRMM/chat/Icons/4.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/4.ico
diff --git a/plugins/TabSRMM/chat/Icons/5.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/5.ico
index a7186bed69..a7186bed69 100644
--- a/plugins/TabSRMM/chat/Icons/5.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/5.ico
diff --git a/plugins/TabSRMM/chat/Icons/6.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/6.ico
index 550c72285e..550c72285e 100644
--- a/plugins/TabSRMM/chat/Icons/6.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/6.ico
diff --git a/plugins/TabSRMM/chat/Icons/action.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/action.ico
index 1bccf99db6..1bccf99db6 100644
--- a/plugins/TabSRMM/chat/Icons/action.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/action.ico
diff --git a/plugins/TabSRMM/chat/Icons/addmode.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/addmode.ico
index 844b7c5d46..844b7c5d46 100644
--- a/plugins/TabSRMM/chat/Icons/addmode.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/addmode.ico
diff --git a/plugins/TabSRMM/chat/Icons/bkgcolor.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/bkgcolor.ico
index 11c54ab502..11c54ab502 100644
--- a/plugins/TabSRMM/chat/Icons/bkgcolor.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/bkgcolor.ico
diff --git a/plugins/TabSRMM/chat/Icons/blank.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/blank.ico
index 7845f62fed..7845f62fed 100644
--- a/plugins/TabSRMM/chat/Icons/blank.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/blank.ico
diff --git a/plugins/TabSRMM/chat/Icons/filter.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/filter.ico
index 02aa5455f6..02aa5455f6 100644
--- a/plugins/TabSRMM/chat/Icons/filter.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/filter.ico
diff --git a/plugins/TabSRMM/chat/Icons/filter2.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/filter2.ico
index 3473eb9979..3473eb9979 100644
--- a/plugins/TabSRMM/chat/Icons/filter2.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/filter2.ico
diff --git a/plugins/TabSRMM/chat/Icons/highlight.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/highlight.ico
index abdf6a0c2c..abdf6a0c2c 100644
--- a/plugins/TabSRMM/chat/Icons/highlight.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/highlight.ico
diff --git a/plugins/TabSRMM/chat/Icons/history.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/history.ico
index b2477bc7d3..b2477bc7d3 100644
--- a/plugins/TabSRMM/chat/Icons/history.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/history.ico
diff --git a/plugins/TabSRMM/chat/Icons/info.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/info.ico
index db229094dc..db229094dc 100644
--- a/plugins/TabSRMM/chat/Icons/info.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/info.ico
diff --git a/plugins/TabSRMM/chat/Icons/join.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/join.ico
index 3e062a1a95..3e062a1a95 100644
--- a/plugins/TabSRMM/chat/Icons/join.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/join.ico
diff --git a/plugins/TabSRMM/chat/Icons/kick.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/kick.ico
index e7de687686..e7de687686 100644
--- a/plugins/TabSRMM/chat/Icons/kick.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/kick.ico
diff --git a/plugins/TabSRMM/chat/Icons/message.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/message.ico
index cb543ce737..cb543ce737 100644
--- a/plugins/TabSRMM/chat/Icons/message.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/message.ico
diff --git a/plugins/TabSRMM/chat/Icons/messageout.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/messageout.ico
index 4376f1e756..4376f1e756 100644
--- a/plugins/TabSRMM/chat/Icons/messageout.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/messageout.ico
diff --git a/plugins/TabSRMM/chat/Icons/nick.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/nick.ico
index 97b681f0c7..97b681f0c7 100644
--- a/plugins/TabSRMM/chat/Icons/nick.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/nick.ico
diff --git a/plugins/TabSRMM/chat/Icons/nicklist_hide.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/nicklist_hide.ico
index 7abd838725..7abd838725 100644
--- a/plugins/TabSRMM/chat/Icons/nicklist_hide.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/nicklist_hide.ico
diff --git a/plugins/TabSRMM/chat/Icons/nicklist_show.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/nicklist_show.ico
index 9390b173b3..9390b173b3 100644
--- a/plugins/TabSRMM/chat/Icons/nicklist_show.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/nicklist_show.ico
diff --git a/plugins/TabSRMM/chat/Icons/notice.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/notice.ico
index 31ebb310f6..31ebb310f6 100644
--- a/plugins/TabSRMM/chat/Icons/notice.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/notice.ico
diff --git a/plugins/TabSRMM/chat/Icons/overlay.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/overlay.ico
index a3f7cf6c36..a3f7cf6c36 100644
--- a/plugins/TabSRMM/chat/Icons/overlay.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/overlay.ico
diff --git a/plugins/TabSRMM/chat/Icons/part.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/part.ico
index 1444253dee..1444253dee 100644
--- a/plugins/TabSRMM/chat/Icons/part.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/part.ico
diff --git a/plugins/TabSRMM/chat/Icons/quit.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/quit.ico
index 2d54d764cf..2d54d764cf 100644
--- a/plugins/TabSRMM/chat/Icons/quit.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/quit.ico
diff --git a/plugins/TabSRMM/chat/Icons/removestatus.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/removestatus.ico
index 7f4711e8a9..7f4711e8a9 100644
--- a/plugins/TabSRMM/chat/Icons/removestatus.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/removestatus.ico
diff --git a/plugins/TabSRMM/chat/Icons/tag1.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/tag1.ico
index 1dc687becd..1dc687becd 100644
--- a/plugins/TabSRMM/chat/Icons/tag1.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/tag1.ico
diff --git a/plugins/TabSRMM/chat/Icons/tag2.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/tag2.ico
index 4fac50a4c8..4fac50a4c8 100644
--- a/plugins/TabSRMM/chat/Icons/tag2.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/tag2.ico
diff --git a/plugins/TabSRMM/chat/Icons/topic.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/topic.ico
index 5c7fff78a1..5c7fff78a1 100644
--- a/plugins/TabSRMM/chat/Icons/topic.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/topic.ico
diff --git a/plugins/TabSRMM/chat/Icons/topicbut.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/topicbut.ico
index 48bec51143..48bec51143 100644
--- a/plugins/TabSRMM/chat/Icons/topicbut.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/topicbut.ico
diff --git a/plugins/TabSRMM/chat/Icons/window.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/window.ico
index d64d924548..d64d924548 100644
--- a/plugins/TabSRMM/chat/Icons/window.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/chat/window.ico
diff --git a/plugins/TabSRMM/res/proxal/check.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/check.ico
index 1472a6e681..1472a6e681 100644
--- a/plugins/TabSRMM/res/proxal/check.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/check.ico
diff --git a/plugins/TabSRMM/TabSRMM_icons/XP/res/clock.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/clock.ico
new file mode 100644
index 0000000000..6ae180c48f
--- /dev/null
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/clock.ico
diff --git a/plugins/TabSRMM/res/proxal/delete.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/delete.ico
index c5266a6b84..c5266a6b84 100644
--- a/plugins/TabSRMM/res/proxal/delete.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/delete.ico
diff --git a/plugins/TabSRMM/res/proxal/emoticon.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/emoticon.ico
index d22cd0c95b..d22cd0c95b 100644
--- a/plugins/TabSRMM/res/proxal/emoticon.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/emoticon.ico
diff --git a/plugins/TabSRMM/res/proxal/file.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/file.ico
index 7a130f520e..7a130f520e 100644
--- a/plugins/TabSRMM/res/proxal/file.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/file.ico
diff --git a/plugins/TabSRMM/res/proxal/font.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/font.ico
index e866b666e0..e866b666e0 100644
--- a/plugins/TabSRMM/res/proxal/font.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/font.ico
diff --git a/plugins/TabSRMM/res/proxal/history.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/history.ico
index b2477bc7d3..b2477bc7d3 100644
--- a/plugins/TabSRMM/res/proxal/history.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/history.ico
diff --git a/plugins/TabSRMM/res/proxal/info.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/info.ico
index c8b2beb955..c8b2beb955 100644
--- a/plugins/TabSRMM/res/proxal/info.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/info.ico
diff --git a/plugins/TabSRMM/res/proxal/italic.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/italic.ico
index c94d290436..c94d290436 100644
--- a/plugins/TabSRMM/res/proxal/italic.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/italic.ico
diff --git a/plugins/TabSRMM/res/proxal/message.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/message.ico
index 963cec572c..963cec572c 100644
--- a/plugins/TabSRMM/res/proxal/message.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/message.ico
diff --git a/plugins/TabSRMM/res/proxal/mtn.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/mtn.ico
index c66482a55f..c66482a55f 100644
--- a/plugins/TabSRMM/res/proxal/mtn.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/mtn.ico
diff --git a/plugins/TabSRMM/res/proxal/multisend.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/multisend.ico
index adb0a7bf3b..adb0a7bf3b 100644
--- a/plugins/TabSRMM/res/proxal/multisend.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/multisend.ico
diff --git a/plugins/TabSRMM/res/proxal/nomtn.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/nomtn.ico
index 76d70f0182..76d70f0182 100644
--- a/plugins/TabSRMM/res/proxal/nomtn.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/nomtn.ico
diff --git a/plugins/TabSRMM/res/proxal/options.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/options.ico
index e72c9e75a2..e72c9e75a2 100644
--- a/plugins/TabSRMM/res/proxal/options.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/options.ico
diff --git a/plugins/TabSRMM/res/proxal/plus.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/plus.ico
index 664f6c87a7..664f6c87a7 100644
--- a/plugins/TabSRMM/res/proxal/plus.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/plus.ico
diff --git a/plugins/TabSRMM/res/proxal/quote.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/quote.ico
index 156f4e6805..156f4e6805 100644
--- a/plugins/TabSRMM/res/proxal/quote.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/quote.ico
diff --git a/plugins/TabSRMM/res/proxal/recentlist.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/recentlist.ico
index 1902ff2c9d..1902ff2c9d 100644
--- a/plugins/TabSRMM/res/proxal/recentlist.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/recentlist.ico
diff --git a/plugins/TabSRMM/res/proxal/sbaroptions.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/sbaroptions.ico
index 3bf4dc2d5c..3bf4dc2d5c 100644
--- a/plugins/TabSRMM/res/proxal/sbaroptions.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/sbaroptions.ico
diff --git a/plugins/TabSRMM/res/proxal/secureOff.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/secureOff.ico
index 085bdb6d6b..085bdb6d6b 100644
--- a/plugins/TabSRMM/res/proxal/secureOff.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/secureOff.ico
diff --git a/plugins/TabSRMM/res/proxal/secureon.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/secureon.ico
index e17fb86f6f..e17fb86f6f 100644
--- a/plugins/TabSRMM/res/proxal/secureon.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/secureon.ico
diff --git a/plugins/TabSRMM/res/proxal/slist.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/slist.ico
index 0ca1f31b90..0ca1f31b90 100644
--- a/plugins/TabSRMM/res/proxal/slist.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/slist.ico
diff --git a/plugins/TabSRMM/res/proxal/sounds_off.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/sounds_off.ico
index f797c207c8..f797c207c8 100644
--- a/plugins/TabSRMM/res/proxal/sounds_off.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/sounds_off.ico
diff --git a/plugins/TabSRMM/res/proxal/sounds_on.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/sounds_on.ico
index 7e5f84f8d5..7e5f84f8d5 100644
--- a/plugins/TabSRMM/res/proxal/sounds_on.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/sounds_on.ico
diff --git a/plugins/TabSRMM/res/proxal/strikethrough.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/strike.ico
index f7be9ce972..f7be9ce972 100644
--- a/plugins/TabSRMM/res/proxal/strikethrough.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/strike.ico
diff --git a/plugins/TabSRMM/res/proxal/underline.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/underline.ico
index 5137d8cb66..5137d8cb66 100644
--- a/plugins/TabSRMM/res/proxal/underline.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/underline.ico
diff --git a/plugins/TabSRMM/res/proxal/userprefs.ico b/plugins/TabSRMM/TabSRMM_icons/XP/res/userprefs.ico
index 86753ad578..86753ad578 100644
--- a/plugins/TabSRMM/res/proxal/userprefs.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/XP/res/userprefs.ico
diff --git a/plugins/TabSRMM/tabmodplus/icons/imgopen.ico b/plugins/TabSRMM/TabSRMM_icons/imgopen.ico
index c1a5c7514e..c1a5c7514e 100644
--- a/plugins/TabSRMM/tabmodplus/icons/imgopen.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/imgopen.ico
diff --git a/plugins/TabSRMM/res/leftarrow.ico b/plugins/TabSRMM/TabSRMM_icons/leftarrow.ico
index f225f4889c..f225f4889c 100644
--- a/plugins/TabSRMM/res/leftarrow.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/leftarrow.ico
diff --git a/plugins/TabSRMM/res/messAnim/M1.ico b/plugins/TabSRMM/TabSRMM_icons/messAnim/M1.ico
index 351ea67b42..351ea67b42 100644
--- a/plugins/TabSRMM/res/messAnim/M1.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/messAnim/M1.ico
diff --git a/plugins/TabSRMM/res/messAnim/M2.ico b/plugins/TabSRMM/TabSRMM_icons/messAnim/M2.ico
index f13dedaca8..f13dedaca8 100644
--- a/plugins/TabSRMM/res/messAnim/M2.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/messAnim/M2.ico
diff --git a/plugins/TabSRMM/res/messAnim/M3.ico b/plugins/TabSRMM/TabSRMM_icons/messAnim/M3.ico
index 635a7c20f0..635a7c20f0 100644
--- a/plugins/TabSRMM/res/messAnim/M3.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/messAnim/M3.ico
diff --git a/plugins/TabSRMM/res/messAnim/M4.ico b/plugins/TabSRMM/TabSRMM_icons/messAnim/M4.ico
index 752e97005d..752e97005d 100644
--- a/plugins/TabSRMM/res/messAnim/M4.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/messAnim/M4.ico
diff --git a/plugins/TabSRMM/res/pulldown.ico b/plugins/TabSRMM/TabSRMM_icons/pulldown.ico
index 372482f6c1..372482f6c1 100644
--- a/plugins/TabSRMM/res/pulldown.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/pulldown.ico
diff --git a/plugins/TabSRMM/res/pullup.ico b/plugins/TabSRMM/TabSRMM_icons/pullup.ico
index 735916cca1..735916cca1 100644
--- a/plugins/TabSRMM/res/pullup.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/pullup.ico
diff --git a/plugins/TabSRMM/icons/ICONSXP/resource.h b/plugins/TabSRMM/TabSRMM_icons/resource.h
index 7e9a8f06cc..7e9a8f06cc 100644
--- a/plugins/TabSRMM/icons/ICONSXP/resource.h
+++ b/plugins/TabSRMM/TabSRMM_icons/resource.h
diff --git a/plugins/TabSRMM/res/rightarrow.ico b/plugins/TabSRMM/TabSRMM_icons/rightarrow.ico
index 7a62791682..7a62791682 100644
--- a/plugins/TabSRMM/res/rightarrow.ico
+++ b/plugins/TabSRMM/TabSRMM_icons/rightarrow.ico
diff --git a/plugins/TabSRMM/res/unknown.bmp b/plugins/TabSRMM/TabSRMM_icons/unknown.bmp
index 96bdb0fd83..96bdb0fd83 100644
--- a/plugins/TabSRMM/res/unknown.bmp
+++ b/plugins/TabSRMM/TabSRMM_icons/unknown.bmp
diff --git a/plugins/TabSRMM/chat/Icons/1.ico b/plugins/TabSRMM/chat/Icons/1.ico
deleted file mode 100644
index 2c7324149c..0000000000
--- a/plugins/TabSRMM/chat/Icons/1.ico
+++ /dev/null
diff --git a/plugins/TabSRMM/chat/Icons/NOVA/1.ico b/plugins/TabSRMM/chat/Icons/NOVA/1.ico
deleted file mode 100644
index 51dcdc4648..0000000000
--- a/plugins/TabSRMM/chat/Icons/NOVA/1.ico
+++ /dev/null
diff --git a/plugins/TabSRMM/tabsrmm-translation.txt b/plugins/TabSRMM/docs/tabsrmm-translation.txt
index ec8942c445..ec8942c445 100644
--- a/plugins/TabSRMM/tabsrmm-translation.txt
+++ b/plugins/TabSRMM/docs/tabsrmm-translation.txt
diff --git a/plugins/TabSRMM/icons/ICONSXP/ICONSXP.rc b/plugins/TabSRMM/icons/ICONSXP/ICONSXP.rc
deleted file mode 100644
index eae155d26d..0000000000
--- a/plugins/TabSRMM/icons/ICONSXP/ICONSXP.rc
+++ /dev/null
@@ -1,176 +0,0 @@
-// Microsoft Visual C++ generated resource script.

-//

-#include "resource.h"

-

-#define APSTUDIO_READONLY_SYMBOLS

-/////////////////////////////////////////////////////////////////////////////

-//

-// Generated from the TEXTINCLUDE 2 resource.

-//

-#include "afxres.h"

-

-/////////////////////////////////////////////////////////////////////////////

-#undef APSTUDIO_READONLY_SYMBOLS

-

-/////////////////////////////////////////////////////////////////////////////

-// German (Germany) resources

-

-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU)

-#ifdef _WIN32

-LANGUAGE LANG_GERMAN, SUBLANG_GERMAN

-#pragma code_page(1252)

-#endif //_WIN32

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// Icon

-//

-

-// Icon with lowest ID value placed first to ensure application icon

-// remains consistent on all systems.

-IDI_HISTORY             ICON                    "../../res/proxal/history.ico"

-IDI_MSGLOGOPT           ICON                    "../../res/proxal/options.ico"

-IDI_ADDCONTACT          ICON                    "../../res/proxal/plus.ico"

-IDI_MULTISEND           ICON                    "../../res/proxal/multisend.ico"

-IDI_TYPING              ICON                    "../../res/proxal/pencil.ico"

-IDI_QUOTE               ICON                    "../../res/proxal/quote.ico"

-IDI_SAVE                ICON                    "../../res/proxal/file.ico"

-IDI_SEND                ICON                    "../../res/proxal/check.ico"

-IDI_CONTACTPIC          ICON                    "../../res/proxal/avatar.ico"

-IDI_USERMENU            ICON                    "../../res/proxal/info.ico"

-IDI_MSGERROR            ICON                    "../../res/proxal/block.ico"

-IDI_CLOSEMSGDLG         ICON                    "../../res/proxal/delete.ico"

-IDI_ICONIN              ICON                    "../../res/proxal/Incom.ico"

-IDI_ICONOUT             ICON                    "../../res/proxal/outg.ico"

-IDI_SMILEYICON          ICON                    "../../res/proxal/emoticon.ico"

-IDI_SELFTYPING_ON       ICON                    "../../res/proxal/mtn.ico"

-IDI_SELFTYPING_OFF      ICON                    "../../res/proxal/nomtn.ico"

-IDI_CONTAINER           ICON                    "../../res/proxal/message.ico"

-IDI_SECUREIM_ENABLED    ICON                    "../../res/proxal/secureOn.ico"

-IDI_SECUREIM_DISABLED   ICON                    "../../res/proxal/secureOff.ico"

-IDI_STATUSCHANGE        ICON                    "../../res/proxal/Status change.ico"

-IDI_FONTBOLD            ICON                    "../../res/proxal/bold.ico"

-IDI_FONTITALIC          ICON                    "../../res/proxal/italic.ico"

-IDI_FONTUNDERLINE       ICON                    "../../res/proxal/underline.ico"

-IDI_STRIKEOUT           ICON                    "../../res/proxal/strikethrough.ico"

-IDI_FONTFACE            ICON                    "../../res/proxal/font.ico"

-IDI_FONTCOLOR           ICON                    "../../res/proxal/font2.ico"

-IDI_SOUNDSON            ICON                    "../../res/proxal/sounds_on.ico"

-IDI_SOUNDSOFF           ICON                    "../../res/proxal/sounds_off.ico"

-IDI_EMPTY               ICON                    "../../res/empty.ico"

-IDI_RESERVED10          ICON                    "../../res/empty.ico"

-IDI_SESSIONLIST         ICON                    "../../res/proxal/slist.ico"

-IDI_CONFIGSIDEBAR       ICON                    "../../res/proxal/sbaroptions.ico"

-IDI_FAVLIST             ICON                    "../../res/proxal/favlist.ico"

-IDI_RECENTLIST          ICON                    "../../res/proxal/recentlist.ico"

-IDI_USERPREFS           ICON                    "../../res/proxal/userprefs.ico"

-IDI_TRAYANIM1           ICON                    "../../res/MessAnim/m1.ico"

-IDI_TRAYANIM2           ICON                    "../../res/MessAnim/m2.ico"

-IDI_TRAYANIM3           ICON                    "../../res/MessAnim/m3.ico"

-IDI_TRAYANIM4           ICON                    "../../res/MessAnim/m4.ico"

-IDI_TAG1                ICON                    "../../chat/Icons/tag1.ico"

-IDI_TAG2                ICON                    "../../chat/Icons/tag2.ico"

-IDI_TOPICBUT            ICON                    "../../chat/Icons/topicbut.ico"

-IDI_JOIN                ICON                    "../../chat/Icons/join.ico"

-IDI_TOPIC               ICON                    "../../chat/Icons/topic.ico"

-IDI_ADDSTATUS           ICON                    "../../chat/Icons/addmode.ico"

-IDI_INFO                ICON                    "../../chat/Icons/info.ico"

-IDI_KICK                ICON                    "../../chat/Icons/kick.ico"

-IDI_MESSAGE             ICON                    "../../chat/Icons/message.ico"

-IDI_NICK                ICON                    "../../chat/Icons/nick.ico"

-IDI_NOTICE              ICON                    "../../chat/Icons/notice.ico"

-IDI_PART                ICON                    "../../chat/Icons/part.ico"

-IDI_QUIT                ICON                    "../../chat/Icons/quit.ico"

-IDI_REMSTATUS           ICON                    "../../chat/Icons/removestatus.ico"

-IDI_HIGHLIGHT           ICON                    "../../chat/Icons/highlight.ico"

-IDI_MESSAGEOUT          ICON                    "../../chat/Icons/messageout.ico"

-IDI_ACTION              ICON                    "../../chat/Icons/action.ico"

-IDI_BKGCOLOR            ICON                    "../../chat/Icons/bkgcolor.ico"

-IDI_CHANMGR             ICON                    "../../chat/Icons/window.ico"

-IDI_FILTER              ICON                    "../../chat/Icons/filter.ico"

-IDI_BLANK               ICON                    "../../chat/Icons/blank.ico"

-IDI_STATUS3             ICON                    "../../chat/Icons/4.ico"

-IDI_STATUS2             ICON                    "../../chat/Icons/3.ico"

-IDI_STATUS4             ICON                    "../../chat/Icons/5.ico"

-IDI_STATUS1             ICON                    "../../chat/Icons/2.ico"

-IDI_STATUS0             ICON                    "../../chat/Icons/blank.ico"

-IDI_STATUS5             ICON                    "../../chat/Icons/6.ico"

-IDI_OVERLAY             ICON                    "../../chat/Icons/overlay.ico"

-IDI_FILTER2             ICON                    "../../chat/Icons/filter2.ico"

-IDI_SHOWNICKLIST        ICON                    "../../chat/icons/nicklist_show.ico"

-IDI_HIDENICKLIST        ICON                    "../../chat/icons/nicklist_hide.ico"

-IDI_PULLDOWNARROW       ICON                    "../../res/pulldown.ico"

-IDI_LEFTARROW           ICON                    "../../res/leftarrow.ico"

-IDI_PULLUPARROW         ICON                    "../../res/pullup.ico"

-IDI_RIGHTARROW          ICON                    "../../res/rightarrow.ico"

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// Bitmap

-//

-

-IDB_UNKNOWNAVATAR       BITMAP                  "../../res/unknown.bmp"

-

-#ifdef APSTUDIO_INVOKED

-/////////////////////////////////////////////////////////////////////////////

-//

-// TEXTINCLUDE

-//

-

-1 TEXTINCLUDE 

-BEGIN

-    "resource.h\0"

-END

-

-2 TEXTINCLUDE 

-BEGIN

-    "#include ""afxres.h""\r\n"

-    "\0"

-END

-

-3 TEXTINCLUDE 

-BEGIN

-    "\r\n"

-    "\0"

-END

-

-#endif    // APSTUDIO_INVOKED

-

-#endif    // German (Germany) resources

-/////////////////////////////////////////////////////////////////////////////

-

-

-/////////////////////////////////////////////////////////////////////////////

-// German (Austria) resources

-

-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEA)

-#ifdef _WIN32

-LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_AUSTRIAN

-#pragma code_page(1252)

-#endif //_WIN32

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// String Table

-//

-

-STRINGTABLE 

-BEGIN

-    IDS_IDENTIFY            "__tabSRMM_ICONPACK 3.5__"

-END

-

-#endif    // German (Austria) resources

-/////////////////////////////////////////////////////////////////////////////

-

-

-

-#ifndef APSTUDIO_INVOKED

-/////////////////////////////////////////////////////////////////////////////

-//

-// Generated from the TEXTINCLUDE 3 resource.

-//

-

-

-/////////////////////////////////////////////////////////////////////////////

-#endif    // not APSTUDIO_INVOKED

-

diff --git a/plugins/TabSRMM/icons/ICONS_NOVA/ICONS_NOVA.rc b/plugins/TabSRMM/icons/ICONS_NOVA/ICONS_NOVA.rc
deleted file mode 100644
index 3e78602345..0000000000
--- a/plugins/TabSRMM/icons/ICONS_NOVA/ICONS_NOVA.rc
+++ /dev/null
@@ -1,175 +0,0 @@
-// Microsoft Visual C++ generated resource script.

-//

-

-#include "../iconsxp/resource.h"

-

-#define APSTUDIO_READONLY_SYMBOLS

-/////////////////////////////////////////////////////////////////////////////

-//

-// Generated from the TEXTINCLUDE 2 resource.

-//

-#include "winres.h"

-

-/////////////////////////////////////////////////////////////////////////////

-#undef APSTUDIO_READONLY_SYMBOLS

-

-/////////////////////////////////////////////////////////////////////////////

-// German (Germany) resources

-

-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU)

-#ifdef _WIN32

-LANGUAGE LANG_GERMAN, SUBLANG_GERMAN

-#pragma code_page(1252)

-#endif //_WIN32

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// Icon

-//

-

-// Icon with lowest ID value placed first to ensure application icon

-// remains consistent on all systems.

-IDI_HISTORY             ICON                    "../../res/nova/history.ico"

-IDI_MSGLOGOPT           ICON                    "../../res/nova/options.ico"

-IDI_ADDCONTACT          ICON                    "../../res/nova/plus.ico"

-IDI_MULTISEND           ICON                    "../../res/nova/multisend.ico"

-IDI_TYPING              ICON                    "../../res/nova/pencil.ico"

-IDI_QUOTE               ICON                    "../../res/nova/quote.ico"

-IDI_SAVE                ICON                    "../../res/nova/file.ico"

-IDI_SEND                ICON                    "../../res/nova/check.ico"

-IDI_CONTACTPIC          ICON                    "../../res/nova/avatar.ico"

-IDI_USERMENU            ICON                    "../../res/nova/info.ico"

-IDI_MSGERROR            ICON                    "../../res/nova/block.ico"

-IDI_CLOSEMSGDLG         ICON                    "../../res/nova/delete.ico"

-IDI_CLOCK               ICON                    "../../res/nova/clock.ico"

-IDI_ICONIN              ICON                    "../../res/nova/Incom.ico"

-IDI_ICONOUT             ICON                    "../../res/nova/outg.ico"

-IDI_SMILEYICON          ICON                    "../../res/nova/emoticon.ico"

-IDI_SELFTYPING_ON       ICON                    "../../res/nova/mtn.ico"

-IDI_SELFTYPING_OFF      ICON                    "../../res/nova/nomtn.ico"

-IDI_CONTAINER           ICON                    "../../res/nova/message.ico"

-IDI_SECUREIM_ENABLED    ICON                    "../../res/nova/secureOn.ico"

-IDI_SECUREIM_DISABLED   ICON                    "../../res/nova/secureOff.ico"

-IDI_STATUSCHANGE        ICON                    "../../res/nova/Status change.ico"

-IDI_FONTBOLD            ICON                    "../../res/nova/bold.ico"

-IDI_FONTITALIC          ICON                    "../../res/nova/italic.ico"

-IDI_FONTUNDERLINE       ICON                    "../../res/nova/underline.ico"

-IDI_STRIKEOUT           ICON                    "../../res/nova/strike.ico"

-IDI_FONTFACE            ICON                    "../../res/nova/font.ico"

-IDI_FONTCOLOR           ICON                    "../../res/nova/font2.ico"

-IDI_SOUNDSON            ICON                    "../../res/nova/sounds_on.ico"

-IDI_SESSIONLIST         ICON                    "../../res/nova/slist.ico"

-IDI_CONFIGSIDEBAR       ICON                    "../../res/nova/sbaroptions.ico"

-IDI_IMAGETAG            ICON                    "../../tabmodplus/icons/imgopen.ico"

-IDI_RECENTLIST          ICON                    "../../res/nova/recentlist.ico"

-IDI_USERPREFS           ICON                    "../../res/nova/userprefs.ico"

-IDI_TRAYANIM1           ICON                    "../../res/MessAnim/m1.ico"

-IDI_TRAYANIM2           ICON                    "../../res/MessAnim/m2.ico"

-IDI_TRAYANIM3           ICON                    "../../res/MessAnim/m3.ico"

-IDI_TRAYANIM4           ICON                    "../../res/MessAnim/m4.ico"

-IDI_TAG1                ICON                    "../../chat/icons/nova/tag1.ico"

-IDI_TAG2                ICON                    "../../chat/icons/nova/tag2.ico"

-IDI_TOPICBUT            ICON                    "../../chat/icons/nova/topicbut.ico"

-IDI_JOIN                ICON                    "../../chat/icons/nova/join.ico"

-IDI_TOPIC               ICON                    "../../chat/icons/nova/topic.ico"

-IDI_ADDSTATUS           ICON                    "../../chat/icons/nova/addmode.ico"

-IDI_INFO                ICON                    "../../chat/icons/nova/info.ico"

-IDI_KICK                ICON                    "../../chat/icons/nova/kick.ico"

-IDI_MESSAGE             ICON                    "../../chat/icons/nova/message.ico"

-IDI_NICK                ICON                    "../../chat/icons/nova/nick.ico"

-IDI_NOTICE              ICON                    "../../chat/icons/nova/notice.ico"

-IDI_PART                ICON                    "../../chat/icons/nova/part.ico"

-IDI_QUIT                ICON                    "../../chat/icons/nova/quit.ico"

-IDI_REMSTATUS           ICON                    "../../chat/icons/nova/removestatus.ico"

-IDI_HIGHLIGHT           ICON                    "../../chat/icons/nova/highlight.ico"

-IDI_MESSAGEOUT          ICON                    "../../chat/icons/nova/messageout.ico"

-IDI_ACTION              ICON                    "../../chat/icons/nova/action.ico"

-IDI_BKGCOLOR            ICON                    "../../chat/icons/nova/bkgcolor.ico"

-IDI_CHANMGR             ICON                    "../../chat/icons/nova/window.ico"

-IDI_FILTER              ICON                    "../../chat/icons/nova/filter.ico"

-IDI_BLANK               ICON                    "../../chat/icons/nova/blank.ico"

-IDI_STATUS3             ICON                    "../../chat/icons/nova/4.ico"

-IDI_STATUS2             ICON                    "../../chat/icons/nova/3.ico"

-IDI_STATUS4             ICON                    "../../chat/icons/nova/5.ico"

-IDI_STATUS1             ICON                    "../../chat/icons/nova/2.ico"

-IDI_STATUS0             ICON                    "../../chat/icons/nova/blank.ico"

-IDI_STATUS5             ICON                    "../../chat/icons/nova/6.ico"

-IDI_OVERLAY             ICON                    "../../chat/icons/nova/overlay.ico"

-IDI_FILTER2             ICON                    "../../chat/icons/nova/filter2.ico"

-IDI_SHOWNICKLIST        ICON                    "../../chat/icons/nova/nicklist_show.ico"

-IDI_HIDENICKLIST        ICON                    "../../chat/icons/nova/nicklist_hide.ico"

-IDI_PULLDOWNARROW       ICON                    "../../res/pulldown.ico"

-IDI_LEFTARROW           ICON                    "../../res/leftarrow.ico"

-IDI_PULLUPARROW         ICON                    "../../res/pullup.ico"

-IDI_RIGHTARROW          ICON                    "../../res/rightarrow.ico"

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// Bitmap

-//

-

-IDB_UNKNOWNAVATAR       BITMAP                  "../../res/unknown.bmp"

-

-#ifdef APSTUDIO_INVOKED

-/////////////////////////////////////////////////////////////////////////////

-//

-// TEXTINCLUDE

-//

-

-1 TEXTINCLUDE 

-BEGIN

-    "resource.h\0"

-END

-

-2 TEXTINCLUDE 

-BEGIN

-    "#include ""afxres.h""\r\n"

-    "\0"

-END

-

-3 TEXTINCLUDE 

-BEGIN

-    "\r\n"

-    "\0"

-END

-

-#endif    // APSTUDIO_INVOKED

-

-#endif    // German (Germany) resources

-/////////////////////////////////////////////////////////////////////////////

-

-

-/////////////////////////////////////////////////////////////////////////////

-// German (Austria) resources

-

-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEA)

-#ifdef _WIN32

-LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_AUSTRIAN

-#pragma code_page(1252)

-#endif //_WIN32

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// String Table

-//

-

-STRINGTABLE 

-BEGIN

-    IDS_IDENTIFY            "__tabSRMM_ICONPACK 5.0__"

-END

-

-#endif    // German (Austria) resources

-/////////////////////////////////////////////////////////////////////////////

-

-

-

-#ifndef APSTUDIO_INVOKED

-/////////////////////////////////////////////////////////////////////////////

-//

-// Generated from the TEXTINCLUDE 3 resource.

-//

-

-

-/////////////////////////////////////////////////////////////////////////////

-#endif    // not APSTUDIO_INVOKED

-

diff --git a/plugins/TabSRMM/res/Logo.ico b/plugins/TabSRMM/res/Logo.ico
deleted file mode 100644
index e777e06380..0000000000
--- a/plugins/TabSRMM/res/Logo.ico
+++ /dev/null
diff --git a/plugins/TabSRMM/res/NOVA/color.ico b/plugins/TabSRMM/res/NOVA/color.ico
deleted file mode 100644
index 689762edbb..0000000000
--- a/plugins/TabSRMM/res/NOVA/color.ico
+++ /dev/null
diff --git a/plugins/TabSRMM/res/NOVA/favlist.ico b/plugins/TabSRMM/res/NOVA/favlist.ico
deleted file mode 100644
index 9b55cd0afa..0000000000
--- a/plugins/TabSRMM/res/NOVA/favlist.ico
+++ /dev/null
diff --git a/plugins/TabSRMM/res/NOVA/icon_down_arrow.ico b/plugins/TabSRMM/res/NOVA/icon_down_arrow.ico
deleted file mode 100644
index 1fd67fdb0f..0000000000
--- a/plugins/TabSRMM/res/NOVA/icon_down_arrow.ico
+++ /dev/null
diff --git a/plugins/TabSRMM/res/NOVA/message.ico b/plugins/TabSRMM/res/NOVA/message.ico
deleted file mode 100644
index b82dc84cb4..0000000000
--- a/plugins/TabSRMM/res/NOVA/message.ico
+++ /dev/null
diff --git a/plugins/TabSRMM/skin/Back1.png b/plugins/TabSRMM/res/SKIN/Back1.png
index a26787c4ce..a26787c4ce 100644
--- a/plugins/TabSRMM/skin/Back1.png
+++ b/plugins/TabSRMM/res/SKIN/Back1.png
diff --git a/plugins/TabSRMM/skin/Back1Inactive.png b/plugins/TabSRMM/res/SKIN/Back1Inactive.png
index d68a175f2f..d68a175f2f 100644
--- a/plugins/TabSRMM/skin/Back1Inactive.png
+++ b/plugins/TabSRMM/res/SKIN/Back1Inactive.png
diff --git a/plugins/TabSRMM/skin/button.png b/plugins/TabSRMM/res/SKIN/button.png
index 5b7e36fdc8..5b7e36fdc8 100644
--- a/plugins/TabSRMM/skin/button.png
+++ b/plugins/TabSRMM/res/SKIN/button.png
diff --git a/plugins/TabSRMM/skin/button_hover.png b/plugins/TabSRMM/res/SKIN/button_hover.png
index 42978749e3..42978749e3 100644
--- a/plugins/TabSRMM/skin/button_hover.png
+++ b/plugins/TabSRMM/res/SKIN/button_hover.png
diff --git a/plugins/TabSRMM/skin/buttonpressed.png b/plugins/TabSRMM/res/SKIN/buttonpressed.png
index db0212b6e9..db0212b6e9 100644
--- a/plugins/TabSRMM/skin/buttonpressed.png
+++ b/plugins/TabSRMM/res/SKIN/buttonpressed.png
diff --git a/plugins/TabSRMM/res/SKIN/close.ico b/plugins/TabSRMM/res/SKIN/close.ico
index 84bd384dbc..ddb5404bd0 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
deleted file mode 100644
index 2bfbf019a7..0000000000
--- a/plugins/TabSRMM/res/SKIN/default.tabsrmm
+++ /dev/null
@@ -1,341 +0,0 @@
-[TabSRMM Theme]

-Version=4

-Cookie=25099837

-[StdFonts]

-Valid=1

-[Font0]

-Face=Candara

-Color=1910060

-Style=1

-Size=243

-Set=0

-[Font1]

-Face=Calibri

-Color=2634300

-Style=0

-Size=243

-Set=0

-[Font2]

-Face=Candara

-Color=2634300

-Style=1

-Size=243

-Set=0

-[Font3]

-Face=Calibri

-Color=2634300

-Style=0

-Size=243

-Set=0

-[Font4]

-Face=Cambria

-Color=8404992

-Style=1

-Size=243

-Set=0

-[Font5]

-Face=Consolas

-Color=0

-Style=0

-Size=245

-Set=0

-[Font6]

-Face=Cambria

-Color=25025

-Style=1

-Size=243

-Set=0

-[Font7]

-Face=Consolas

-Color=0

-Style=0

-Size=245

-Set=0

-[Font8]

-Face=Calibri

-Color=4276545

-Style=0

-Size=243

-Set=0

-[Font9]

-Face=Calibri

-Color=3622227

-Style=0

-Size=243

-Set=0

-[Font10]

-Face=Calibri

-Color=4802889

-Style=0

-Size=243

-Set=0

-[Font11]

-Face=Calibri

-Color=3622227

-Style=0

-Size=243

-Set=0

-[Font12]

-Face=Cambria

-Color=16744576

-Style=1

-Size=243

-Set=0

-[Font13]

-Face=Consolas

-Color=6316128

-Style=0

-Size=245

-Set=0

-[Font14]

-Face=Cambria

-Color=6381921

-Style=1

-Size=243

-Set=0

-[Font15]

-Face=Consolas

-Color=6316128

-Style=0

-Size=245

-Set=0

-[Font16]

-Face=Comic Sans MS

-Color=12517376

-Style=0

-Size=243

-Set=0

-[Font17]

-Face=Calibri

-Color=18653

-Style=0

-Size=243

-Set=0

-[Font18]

-Face=Calibri

-Color=255

-Style=0

-Size=243

-Set=0

-[Font19]

-Face=Calibri

-Color=16711935

-Style=0

-Size=243

-Set=0

-[Font20]

-Face=Arial

-Color=16711680

-Style=0

-Size=245

-Set=0

-[Font21]

-Face=Arial

-Color=18135

-Style=0

-Size=245

-Set=0

-[MiscFonts]

-Valid=1

-[IPFont100]

-Face=Comic Sans MS

-Color=4194432

-Style=3

-Size=11

-Set=0

-[IPFont101]

-Face=Lucida Grande

-Color=4605510

-Style=1

-Size=8

-Set=0

-[IPFont102]

-Face=Lucida Grande

-Color=5447138

-Style=2

-Size=8

-Set=0

-[IPFont103]

-Face=Lucida Grande

-Color=11567140

-Style=2

-Size=8

-Set=0

-[IPFont104]

-Face=Lucida Grande

-Color=7682361

-Style=0

-Size=8

-Set=0

-[IPFont105]

-Face=Candara

-Color=526344

-Style=1

-Size=9

-Set=0

-[ChatFonts]

-Valid=1

-[ChatFont0]

-Face=Trebuchet MS

-Color=4079166

-Style=0

-Size=245

-Set=0

-[ChatFont1]

-Face=Calibri

-Color=8268161

-Style=1

-Size=244

-Set=0

-[ChatFont2]

-Face=Calibri

-Color=2570178

-Style=1

-Size=244

-Set=0

-[ChatFont3]

-Face=Calibri

-Color=4685383

-Style=0

-Size=243

-Set=0

-[ChatFont4]

-Face=Calibri

-Color=5939360

-Style=0

-Size=243

-Set=0

-[ChatFont5]

-Face=Calibri

-Color=1392614

-Style=0

-Size=243

-Set=0

-[ChatFont6]

-Face=Calibri

-Color=6579300

-Style=0

-Size=243

-Set=0

-[ChatFont7]

-Face=Calibri

-Color=10508890

-Style=0

-Size=243

-Set=0

-[ChatFont8]

-Face=Calibri

-Color=3965600

-Style=0

-Size=243

-Set=0

-[ChatFont9]

-Face=Calibri

-Color=4276545

-Style=0

-Size=243

-Set=0

-[ChatFont10]

-Face=Calibri

-Color=11157059

-Style=0

-Size=243

-Set=0

-[ChatFont11]

-Face=Calibri

-Color=10503750

-Style=0

-Size=243

-Set=0

-[ChatFont12]

-Face=Calibri

-Color=11184640

-Style=0

-Size=243

-Set=0

-[ChatFont13]

-Face=Calibri

-Color=4625990

-Style=0

-Size=243

-Set=0

-[ChatFont14]

-Face=Calibri

-Color=4605590

-Style=0

-Size=243

-Set=0

-[ChatFont15]

-Face=Calibri

-Color=10508960

-Style=0

-Size=243

-Set=0

-[ChatFont16]

-Face=Calibri

-Color=5281460

-Style=0

-Size=243

-Set=0

-[ChatFont17]

-Face=Webdings

-Color=193

-Style=0

-Size=243

-Set=2

-[ChatFont18]

-Face=Consolas

-Color=7161362

-Style=1

-Size=245

-Set=0

-[Message Log]

-BackgroundColor=15132390

-IncomingBG=15790320

-OutgoingBG=15790320

-InputBG=15790320

-HgridColor=12566463

-DWFlags=-1677697439

-VGrid=1

-ExtraMicroLF=0

-LeftIndent=80

-RightIndent=9

-OldIncomingBG=15790320

-OldOutgoingBG=15790320

-StatusBG=14277119

-[Chat]

-UserListBG=13619151

-[Custom Colors]

-InfopanelBG=15790320

-cc1=179

-cc2=9071957

-cc3=13882323

-cc4=13816530

-cc5=179

-[Templates]

-Message In=%I %N %h:%m [%E] %l%M

-Message Out=%I %N %h:%m [%E] %l%M

-Group In (Start)= %I %S%fm%cs» %N, %fm%c4%&r%?n%H%S%fm%cs » %fd%c0[%T%fd%c0]%|%M

-Group Out (Start)= %I %S%fm%cs» %N, %fm%c4%&r%?n%H%S%fm%cs » %fd%c0[%T%fd%c0]%|%M

-Group In (Inner)= %S%fm%cs» %fd%c0[%T%fd%c0]%|%M

-Group Out (Inner)= %S%fm%cs« %fd%c0[%T%fd%c0]%|%M

-Status change=  %I %fm%&r at %fm%&T,%! %N, %M

-Error message=%I%S %r, %h:%m:%s, %e%l%M

-[RTLTemplates]

-Message In=%I %S %N  %D%n%S %T%|%M

-Message Out=%I %S %N  %D%n%S %T%|%M

-Group In (Start)=%I %S%fm%cs» %N %fm%c4%&r%?n%H%S%fd%c0]%fm%cs» %T%fd%c0[%|%M

-Group Out (Start)=%I %S%fm%cs« %N %fm%c4%&D%n%H%S%fd%c0]%fm%cs« %T%fd%c0[%|%M

-Group In (Inner)=%S %fd%c0]%fm%cs» %T%fd%c0[%|%M

-Group Out (Inner)=%S %fd%c0]%fm%cs« %T%fd%c0[%|%M

-Status change=%I%S %D, %T, %N %M%!

-Error message=%I%S %D, %T, %e%l%M

-[Nick Colors]

-0=4210816

-1=12615680

-2=8421376

-3=7161362

-4=7161362

-5=10721934

-6=16777215

-7=0

diff --git a/plugins/TabSRMM/res/SKIN/default.tsk b/plugins/TabSRMM/res/SKIN/default.tsk
deleted file mode 100644
index 1bfea009d5..0000000000
--- a/plugins/TabSRMM/res/SKIN/default.tsk
+++ /dev/null
@@ -1,342 +0,0 @@
-; default tabsrmm skin

-; googletalk - lookalike

-

-[%Frame]

-ALPHA=100

-;Left=12

-;Top=12

-;Right=12

-;Bottom=12

-;COLOR1=262b35

-;COLOR2=262b35

-;TEXTCOLOR=cccccc

-

-[%FrameInactive]

-ALPHA=100

-Left=12

-Top=12

-Right=12

-Bottom=12

-;COLOR1=ffffff

-;COLOR2=ffffff

-;TEXTCOLOR=cccccc

-

-;[%InfoPanelfield]

-;ALPHA=0

-;COLOR1=F5F5F5

-;COLOR2=F5F5F5

-;TEXTCOLOR=000000

-;top=0

-;bottom=0

-;left=0

-;right=0

-;GRADIENT=none

-

-[%Tabitem_active]

-ALPHA=100

-TEXTCOLOR=ffffff

-Bottom=-3

-

-[%Tabitem_active_bottom]

-ALPHA=100

-TEXTCOLOR=ffffff

-Top=-3

-

-

-[%Tabitem]

-ALPHA=100

-TEXTCOLOR=ffffff

-

-[%Tabitem_bottom]

-ALPHA=100

-TEXTCOLOR=ffffff

-

-[%Tabitem_hottrack]

-ALPHA=100

-TEXTCOLOR=ffffff

-

-[%Tabitem_hottrack_bottom]

-ALPHA=100

-TEXTCOLOR=ffffff

-

-[%Tabpage]

-;ALPHA=100

-;TEXTCOLOR=cccccc

-

-

-[%Titlebutton]

-ALPHA=0

-COLOR1=f5f5f5

-COLOR2=f5f5f5

-TEXTCOLOR=787878

-

-GRADIENT=down

-RADIUS=6

-Left=1

-Right=1

-

-[%Titlebuttonmouseover]

-ALPHA=0

-COLOR1=d3d3d3

-COLOR2=d3d3d3

-TEXTCOLOR=787878

-GRADIENT=none

-RADIUS=6

-

-[%Titlebuttonpressed]

-ALPHA=0

-COLOR1=d3d3d3

-COLOR2=d3d3d3

-COLOR2_TRANSPARENT=0

-TEXTCOLOR=787878

-GRADIENT=none

-RADIUS=6

-

-[%Container]

-ALPHA=100

-COLOR1=F5F5F5

-COLOR2=F5F5F5

-COLOR2_TRANSPARENT=0

-TEXTCOLOR=202020

-CORNER=0

-GRADIENT=none

-RADIUS=0

-

-[%Buttonnotpressed]

-;ALPHA=50

-;COLOR1=444444

-;COLOR2=444444

-;TEXTCOLOR=fefefe

-

-[%Buttonpressed]

-;ALPHA=10

-;COLOR1=444444

-;COLOR2=444444

-;TEXTCOLOR=fefefe

-

-[%Buttonmouseover]

-;ALPHA=0

-;COLOR1=444444

-;COLOR2=444444

-;TEXTCOLOR=fefefe

-

-[%Statusbarpanel]

-;TEXTCOLOR=ffffff

-

-[%InputArea]

-ALPHA=100

-COLOR1=f5f5f5

-COLOR2=f5f5f5

-TEXTCOLOR=cccc

-Left=4

-Right=4

-top=4

-bottom=4

-radius=13

-

-[%MessageLog]

-ALPHA=100

-COLOR1=f5f5f5

-COLOR2=f5f5f5

-TEXTCOLOR=cccc

-Left=4

-Right=4

-top=4

-bottom=4

-radius=13

-

-[%Userlist]

-ALPHA=100

-COLOR1=f5f5f5

-COLOR2=f5f5f5

-TEXTCOLOR=cccc

-Left=4

-Right=4

-top=4

-bottom=4

-radius=13

-

-[%InfoPanelBackground]

-ALPHA=100

-COLOR1=fff6f2

-COLOR2=FFD4C1

-TEXTCOLOR=cccc

-Left=1

-Right=1

-top=1

-bottom=1

-radius=0

-Gradient=down

-

-[$glyphs]

-Image=glyph.png

-Alpha=100

-Perpixel=1

-

-[$Frame]

-ALPHA=100

-Glyph=26, 0, 75, 56

-Image=Back.png

-PERPIXEL=1

-fillColor=ffffff

-;ColorKey=0000ff

-Right=24

-Top=28

-Bottom=28

-Left=24

-Item0=Frame

-

-[$FrameInactive]

-ALPHA=100

-Glyph=81, 21, 130,77

-Image=Back.png

-PERPIXEL=1

-fillColor=ffffff

-;ColorKey=0000ff

-Right=24

-Top=28

-Bottom=28

-Left=24

-Item0=FrameInactive

-

-[$Statuspanel]

-Glyph=80,0,99,20

-Left=4

-Top=4

-Right=4

-Bottom=4

-Item0=Statusbarpanel

-PERPIXEL=1

-

-[$Tabactive]

-Glyph=102,1,125,20

-;fillColor=5e6268

-Left=6

-Top=4

-Right=6

-Bottom=4

-Item0=Tabitem_active

-PERPIXEL=1

-

-[$Tabactivebottom]

-Glyph=128,0,151,19

-;fillColor=5e6268

-Left=6

-Top=4

-Right=6

-Bottom=4

-Item0=Tabitem_active_bottom

-PERPIXEL=1

-

-[$TabInactive]

-Glyph=154,0,177,19

-;fillColor=5e6268

-Left=6

-Top=4

-Right=6

-Bottom=4

-Item0=Tabitem

-Item1=Tabitem_hottrack

-PERPIXEL=1

-

-[$TabInactiveBottom]

-Glyph=0, 0, 23, 18

-;fillColor=5e6268

-Left=6

-Top=4

-Right=6

-Bottom=4

-Item0=Tabitem_bottom

-Item1=Tabitem_hottrack_bottom

-PERPIXEL=1

-

-[$Tabpage]

-Glyph=180,0,199,20

-fillColor=ffffff

-Left=5

-Top=5

-Right=5

-Bottom=5

-Item0=Tabpage

-Item1=InputArea

-Item2=MessageLog

-Item3=Userlist

-PERPIXEL=1

-

-[$Button]

-Glyph=80,0,99,20

-Left=4

-Top=4

-Right=4

-Bottom=4

-Item0=Buttonnotpressed

-PERPIXEL=1

-

-[$Buttonmouseover]

-Glyph=0,59,19,79

-Left=4

-Top=4

-Right=4

-Bottom=4

-Item0=Buttonmouseover

-PERPIXEL=1

-

-[$Buttonpressed]

-Glyph=0,21,19,41

-Left=4

-Top=4

-Right=4

-Bottom=4

-Item0=Buttonpressed

-PERPIXEL=1

-

-[Global]

-CloseGlyph=close.ico

-MinimizeGlyph=minimize.ico

-MaximizeGlyph=maximize.ico

-FontColor=787878

-Version=1

-Signature=101

-FrameLessMode=1

-CompositedWindow=0

-TabSkinning=1

-LightShadow=f5f5f5

-DarkShadow=f5f5f5

-TabTextNormal=787878

-TabTextActive=787878

-TabTextUnread=787878

-TabTextHottrack=787878

-MenuBarBG=f5f5f5

-NoScrollbars=0

-SbarHeight=15

-Name=Default Skin for TabSRMM 3

-

-[WindowFrame]

-Left=7

-Right=7

-Bottom=7

-Caption=18

-ClipFrame=0

-CaptionPadding=5

-RadiusTL=6

-RadiusTR=6

-RadiusBL=6

-RadiusBR=6

-TitleButtonWidth = 16

-TitleButtonHeight = 16

-TitleButtonTopOffset = 6

-CaptionOffset = 6

-

-[ClientArea]

-Left=2

-Right=2

-Top=1

-Bottom=2

-Inner=2

-

-[Avatars]

-BorderType=1

-BorderColor=787878

-

-[Theme]

-File=default.tabsrmm

diff --git a/plugins/TabSRMM/skin/frames.png b/plugins/TabSRMM/res/SKIN/frames.png
index b14d31079b..b14d31079b 100644
--- a/plugins/TabSRMM/skin/frames.png
+++ b/plugins/TabSRMM/res/SKIN/frames.png
diff --git a/plugins/TabSRMM/res/SKIN/glyph.png b/plugins/TabSRMM/res/SKIN/glyph.png
deleted file mode 100644
index e6d4c1c016..0000000000
--- a/plugins/TabSRMM/res/SKIN/glyph.png
+++ /dev/null
diff --git a/plugins/TabSRMM/res/SKIN/logo.png b/plugins/TabSRMM/res/SKIN/logo.png
deleted file mode 100644
index 4f2972bdaf..0000000000
--- a/plugins/TabSRMM/res/SKIN/logo.png
+++ /dev/null
diff --git a/plugins/TabSRMM/res/SKIN/maximize.ico b/plugins/TabSRMM/res/SKIN/maximize.ico
index 2abcf619e1..0aa6781335 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..dad985d2c2 100644
--- a/plugins/TabSRMM/res/SKIN/minimize.ico
+++ b/plugins/TabSRMM/res/SKIN/minimize.ico
diff --git a/plugins/TabSRMM/skin/panel.png b/plugins/TabSRMM/res/SKIN/panel.png
index e9c66e74cd..e9c66e74cd 100644
--- a/plugins/TabSRMM/skin/panel.png
+++ b/plugins/TabSRMM/res/SKIN/panel.png
diff --git a/plugins/TabSRMM/skin/tab.png b/plugins/TabSRMM/res/SKIN/tab.png
index 908a3862c9..908a3862c9 100644
--- a/plugins/TabSRMM/skin/tab.png
+++ b/plugins/TabSRMM/res/SKIN/tab.png
diff --git a/plugins/TabSRMM/skin/tabhover.png b/plugins/TabSRMM/res/SKIN/tabhover.png
index b520898d54..b520898d54 100644
--- a/plugins/TabSRMM/skin/tabhover.png
+++ b/plugins/TabSRMM/res/SKIN/tabhover.png
diff --git a/plugins/TabSRMM/skin/tabsrmm.tsk b/plugins/TabSRMM/res/SKIN/tabsrmm.tsk
index 95db064216..95db064216 100644
--- a/plugins/TabSRMM/skin/tabsrmm.tsk
+++ b/plugins/TabSRMM/res/SKIN/tabsrmm.tsk
diff --git a/plugins/TabSRMM/skin/textborder.png b/plugins/TabSRMM/res/SKIN/textborder.png
index 61af9e959b..61af9e959b 100644
--- a/plugins/TabSRMM/skin/textborder.png
+++ b/plugins/TabSRMM/res/SKIN/textborder.png
diff --git a/plugins/TabSRMM/chat/chat.rc b/plugins/TabSRMM/res/chat.rc
index 47c2a877fa..e6b04cee23 100644
--- a/plugins/TabSRMM/chat/chat.rc
+++ b/plugins/TabSRMM/res/chat.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "chat_resource.h"

+#include "..\src\chat\chat_resource.h"

 

 #define APSTUDIO_READONLY_SYMBOLS

 /////////////////////////////////////////////////////////////////////////////

@@ -295,14 +295,6 @@ BEGIN
         HORZGUIDE, 174

         HORZGUIDE, 212

     END

-

-    IDD_OPTIONS3, DIALOG

-    BEGIN

-    END

-

-    IDD_OPTIONS4, DIALOG

-    BEGIN

-    END

 END

 #endif    // APSTUDIO_INVOKED

 

@@ -325,7 +317,7 @@ LANGUAGE LANG_SWEDISH, SUBLANG_SWEDISH
 

 1 TEXTINCLUDE 

 BEGIN

-    "chat_resource.h\0"

+    "..\\src\\chat\\chat_resource.h\0"

 END

 

 2 TEXTINCLUDE 

diff --git a/plugins/TabSRMM/res/empty.ico b/plugins/TabSRMM/res/empty.ico
deleted file mode 100644
index e4bb7da7e0..0000000000
--- a/plugins/TabSRMM/res/empty.ico
+++ /dev/null
diff --git a/plugins/TabSRMM/msgwindow.rc b/plugins/TabSRMM/res/msgwindow.rc
index 79558df452..92d5916abe 100644
--- a/plugins/TabSRMM/msgwindow.rc
+++ b/plugins/TabSRMM/res/msgwindow.rc
@@ -1,7 +1,7 @@
 // Microsoft Visual C++ generated resource script.

 //

 #include <winres.h>

-#include "include/resource.h"

+#include "..\src\include\resource.h"

 

 #define APSTUDIO_READONLY_SYMBOLS

 /////////////////////////////////////////////////////////////////////////////

@@ -12,8 +12,8 @@
 #include "windows.h"

 #include "richedit.h"

 #undef APSTUDIO_HIDDEN_SYMBOLS

-#include "../../include/statusmodes.h"

-#include "include/version.h"

+#include "..\..\..\include\statusmodes.h"

+#include "..\src\include\version.h"

 

 /////////////////////////////////////////////////////////////////////////////

 #undef APSTUDIO_READONLY_SYMBOLS

@@ -103,7 +103,7 @@ END
 

 1 TEXTINCLUDE 

 BEGIN

-    "include/resource.h\0"

+    "..\\src\\include\\resource.h\0"

 END

 

 2 TEXTINCLUDE 

@@ -112,7 +112,7 @@ BEGIN
     "#include ""windows.h""\r\n"

     "#include ""richedit.h""\r\n"

     "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n"

-    "#include ""..\\..\\include\\statusmodes.h""\r\n"

+    "#include ""..\\..\\..\\include\\statusmodes.h""\r\n"

     "\0"

 END

 

diff --git a/plugins/TabSRMM/res/proxal/color.ico b/plugins/TabSRMM/res/proxal/color.ico
deleted file mode 100644
index 11c54ab502..0000000000
--- a/plugins/TabSRMM/res/proxal/color.ico
+++ /dev/null
diff --git a/plugins/TabSRMM/res/proxal/favlist.ico b/plugins/TabSRMM/res/proxal/favlist.ico
deleted file mode 100644
index 2f6f34dcf4..0000000000
--- a/plugins/TabSRMM/res/proxal/favlist.ico
+++ /dev/null
diff --git a/plugins/TabSRMM/resource.rc b/plugins/TabSRMM/res/resource.rc
index e2be8995cb..c0bf5afd50 100644
--- a/plugins/TabSRMM/resource.rc
+++ b/plugins/TabSRMM/res/resource.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "include\resource.h"

+#include "..\src\include\resource.h"

 

 #define APSTUDIO_READONLY_SYMBOLS

 /////////////////////////////////////////////////////////////////////////////

@@ -9,7 +9,7 @@
 //

 #include <windows.h>

 #include <winres.h>

-#include "../../include/statusmodes.h"

+#include "..\..\..\include\statusmodes.h"

 

 

 

@@ -617,9 +617,9 @@ END
 // Cursor

 //

 

-IDC_HYPERLINKHAND       CURSOR                  "../../src/res/cursor_hyperlink.cur"

-IDC_DROP                CURSOR                  "../../src/res/cursor_drag_copy.CUR"

-IDC_DROPUSER            CURSOR                  "../../src/res/cursor_drop_user.cur"

+IDC_HYPERLINKHAND       CURSOR                  "..\\..\\..\\src\\res\\cursor_hyperlink.cur"

+IDC_DROP                CURSOR                  "..\\..\\..\\src\\res\\cursor_drag_copy.cur"

+IDC_DROPUSER            CURSOR                  "..\\..\\..\\src\\res\\cursor_drop_user.cur"

 

 /////////////////////////////////////////////////////////////////////////////

 //

@@ -877,60 +877,10 @@ END
 

 // Icon with lowest ID value placed first to ensure application icon

 // remains consistent on all systems.

-IDI_FEATURE_DISABLED    ICON                    "res/overlay_disabled.ico"

-IDI_ENABLED             ICON                    "res/res_TN/popup.ico"

-IDI_DISABLED            ICON                    "res/res_TN/popup_no.ico"

-IDI_FEATURE_ENABLED     ICON                    "res/overlay_enabled.ico"

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// DESIGNINFO

-//

-

-#ifdef APSTUDIO_INVOKED

-GUIDELINES DESIGNINFO

-BEGIN

-    IDD_EXCEPTION, DIALOG

-    BEGIN

-    END

-

-    IDD_USERPREFS, DIALOG

-    BEGIN

-    END

-

-    IDD_CONTAINEROPTIONS, DIALOG

-    BEGIN

-    END

-

-    IDD_OPT_MSGDLG, DIALOG

-    BEGIN

-    END

-

-    IDD_OPT_CONTAINERS, DIALOG

-    BEGIN

-    END

-

-    IDD_TABCONFIG, DIALOG

-    BEGIN

-    END

-

-    IDD_ABOUT, DIALOG

-    BEGIN

-    END

-

-    IDD_OPT_SKIN, DIALOG

-    BEGIN

-    END

-

-    IDD_USERPREFS_FRAME, DIALOG

-    BEGIN

-    END

-

-    IDD_USERPREFS1, DIALOG

-    BEGIN

-    END

-END

-#endif    // APSTUDIO_INVOKED

+IDI_FEATURE_DISABLED    ICON                    "overlay_disabled.ico"

+IDI_ENABLED             ICON                    "res_TN\\popup.ico"

+IDI_DISABLED            ICON                    "res_TN\\popup_no.ico"

+IDI_FEATURE_ENABLED     ICON                    "overlay_enabled.ico"

 

 #endif    // Neutral resources

 /////////////////////////////////////////////////////////////////////////////

@@ -1106,14 +1056,14 @@ END
 

 1 TEXTINCLUDE 

 BEGIN

-    "include\\resource.h\0"

+    "..\\src\\include\\resource.h\0"

 END

 

 2 TEXTINCLUDE 

 BEGIN

     "#include <windows.h>\r\n"

     "#include <winres.h>\r\n"

-    "#include ""../../include/statusmodes.h""\r\n"

+    "#include ""..\\..\\..\\include\\statusmodes.h""\r\n"

     "\r\r\n"

     "\r\0"

 END

@@ -1131,10 +1081,10 @@ END
 // SKIN_GLYPH

 //

 

-IDR_SKIN_AERO           SKIN_GLYPH              "res\\SKIN\\tabskin_aero.png"

-IDR_SKIN_AERO_GLOW      SKIN_GLYPH              "res\\SKIN\\tabskin_aero_glow.png"

-IDR_SKIN_AERO_SWITCHBAR SKIN_GLYPH              "res\\SKIN\\tabskin_aero_button.png"

-IDR_SKIN_LOGO           SKIN_GLYPH              "res\\SKIN\\unknown.png"

+IDR_SKIN_AERO           SKIN_GLYPH              "SKIN\\tabskin_aero.png"

+IDR_SKIN_AERO_GLOW      SKIN_GLYPH              "SKIN\\tabskin_aero_glow.png"

+IDR_SKIN_AERO_SWITCHBAR SKIN_GLYPH              "SKIN\\tabskin_aero_button.png"

+IDR_SKIN_LOGO           SKIN_GLYPH              "SKIN\\unknown.png"

 #endif    // English (United States) resources

 /////////////////////////////////////////////////////////////////////////////

 

diff --git a/plugins/TabSRMM/skin/close.ico b/plugins/TabSRMM/skin/close.ico
deleted file mode 100644
index ddb5404bd0..0000000000
--- a/plugins/TabSRMM/skin/close.ico
+++ /dev/null
diff --git a/plugins/TabSRMM/skin/maximize.ico b/plugins/TabSRMM/skin/maximize.ico
deleted file mode 100644
index 0aa6781335..0000000000
--- a/plugins/TabSRMM/skin/maximize.ico
+++ /dev/null
diff --git a/plugins/TabSRMM/skin/minimize.ico b/plugins/TabSRMM/skin/minimize.ico
deleted file mode 100644
index dad985d2c2..0000000000
--- a/plugins/TabSRMM/skin/minimize.ico
+++ /dev/null
diff --git a/plugins/TabSRMM/src/ImageDataObject.cpp b/plugins/TabSRMM/src/ImageDataObject.cpp
index 90fb804622..65e8e8d4dd 100644
--- a/plugins/TabSRMM/src/ImageDataObject.cpp
+++ b/plugins/TabSRMM/src/ImageDataObject.cpp
@@ -35,7 +35,7 @@
  */

 

 #include "commonheaders.h"

-#include "../include/ImageDataObject.h"

+#include "include\ImageDataObject.h"

 

 extern void ReleaseRichEditOle(IRichEditOle *ole)

 {

diff --git a/plugins/TabSRMM/chat/chat.h b/plugins/TabSRMM/src/chat/chat.h
index 97224cef53..97224cef53 100644
--- a/plugins/TabSRMM/chat/chat.h
+++ b/plugins/TabSRMM/src/chat/chat.h
diff --git a/plugins/TabSRMM/chat/chat_resource.h b/plugins/TabSRMM/src/chat/chat_resource.h
index 07a9bb8ba4..07a9bb8ba4 100644
--- a/plugins/TabSRMM/chat/chat_resource.h
+++ b/plugins/TabSRMM/src/chat/chat_resource.h
diff --git a/plugins/TabSRMM/chat/chatprototypes.h b/plugins/TabSRMM/src/chat/chatprototypes.h
index c304b38cec..c304b38cec 100644
--- a/plugins/TabSRMM/chat/chatprototypes.h
+++ b/plugins/TabSRMM/src/chat/chatprototypes.h
diff --git a/plugins/TabSRMM/chat/clist.cpp b/plugins/TabSRMM/src/chat/clist.cpp
index a3c5b75d24..8e095e1585 100644
--- a/plugins/TabSRMM/chat/clist.cpp
+++ b/plugins/TabSRMM/src/chat/clist.cpp
@@ -34,7 +34,7 @@ $Id: clist.c 10402 2009-07-24 00:35:21Z silvercircle $
  * handles interaction of the group chat implementation with the contact list plugin

  */

 

-#include "../src/commonheaders.h"

+#include "..\commonheaders.h"

 

 char *szChatIconString = "chaticon";

 

@@ -323,4 +323,3 @@ HANDLE CList_FindRoom(const char* pszModule, const TCHAR* pszRoom)
 	}

 	return 0;

 }

-

diff --git a/plugins/TabSRMM/chat/colorchooser.cpp b/plugins/TabSRMM/src/chat/colorchooser.cpp
index dc481fa8ed..72366db24b 100644
--- a/plugins/TabSRMM/chat/colorchooser.cpp
+++ b/plugins/TabSRMM/src/chat/colorchooser.cpp
@@ -36,7 +36,7 @@
  *

  */

 

-#include "../src/commonheaders.h"

+#include "..\commonheaders.h"

 #include <math.h>

 

 static int CalculateCoordinatesToButton(COLORCHOOSER * pCC, POINT pt)

diff --git a/plugins/TabSRMM/chat/log.cpp b/plugins/TabSRMM/src/chat/log.cpp
index 72768a3a1d..bdadea5bf5 100644
--- a/plugins/TabSRMM/chat/log.cpp
+++ b/plugins/TabSRMM/src/chat/log.cpp
@@ -37,7 +37,7 @@
  *

  */

 

-#include "../src/commonheaders.h"

+#include "..\commonheaders.h"

 #include <math.h>

 #include <mbstring.h>

 #include <shlwapi.h>

diff --git a/plugins/TabSRMM/chat/main.cpp b/plugins/TabSRMM/src/chat/main.cpp
index be283ae24a..56489a2fc9 100644
--- a/plugins/TabSRMM/chat/main.cpp
+++ b/plugins/TabSRMM/src/chat/main.cpp
@@ -36,7 +36,7 @@
  *

  */

 

-#include "../src/commonheaders.h"

+#include "..\commonheaders.h"

 

 HANDLE		g_hWindowList;

 HMENU		g_hMenu = NULL;

diff --git a/plugins/TabSRMM/chat/manager.cpp b/plugins/TabSRMM/src/chat/manager.cpp
index 3d13a9b714..0dfa59a470 100644
--- a/plugins/TabSRMM/chat/manager.cpp
+++ b/plugins/TabSRMM/src/chat/manager.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 $Id: manager.cpp 14208 2012-03-26 13:56:42Z silvercircle $

 */

 

-#include "../src/commonheaders.h"

+#include "..\commonheaders.h"

 

 extern  TCHAR	*pszActiveWndID ;

 extern  char	*pszActiveWndModule ;

diff --git a/plugins/TabSRMM/chat/message.cpp b/plugins/TabSRMM/src/chat/message.cpp
index ef00408bb1..71fbba7276 100644
--- a/plugins/TabSRMM/chat/message.cpp
+++ b/plugins/TabSRMM/src/chat/message.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 $Id: message.c 10402 2009-07-24 00:35:21Z silvercircle $

 */

 

-#include "../src/commonheaders.h"

+#include "..\commonheaders.h"

 #include <math.h>

 

 static int RTFColorToIndex(int *pIndex, int iCol, SESSION_INFO* si)

diff --git a/plugins/TabSRMM/chat/muchighlight.cpp b/plugins/TabSRMM/src/chat/muchighlight.cpp
index d3006fe5f4..7b05b5b81b 100644
--- a/plugins/TabSRMM/chat/muchighlight.cpp
+++ b/plugins/TabSRMM/src/chat/muchighlight.cpp
@@ -32,7 +32,7 @@
  *

  */

 

-#include "../src/commonheaders.h"

+#include "..\commonheaders.h"

 

 //#define __HLT_PERFSTATS 0

 

diff --git a/plugins/TabSRMM/chat/muchighlight.h b/plugins/TabSRMM/src/chat/muchighlight.h
index e6e403a040..e6e403a040 100644
--- a/plugins/TabSRMM/chat/muchighlight.h
+++ b/plugins/TabSRMM/src/chat/muchighlight.h
diff --git a/plugins/TabSRMM/chat/options.cpp b/plugins/TabSRMM/src/chat/options.cpp
index 5eb31e6913..9d2fec8b48 100644
--- a/plugins/TabSRMM/chat/options.cpp
+++ b/plugins/TabSRMM/src/chat/options.cpp
@@ -36,7 +36,7 @@
  *

  */

 

-#include "../src/commonheaders.h"

+#include "..\commonheaders.h"

 #undef Translate

 

 #define TranslateA(s)   ((char*)CallService(MS_LANGPACK_TRANSLATESTRING,0,(LPARAM)(s)))

diff --git a/plugins/TabSRMM/chat/services.cpp b/plugins/TabSRMM/src/chat/services.cpp
index 3197f11db4..edd9f25d79 100644
--- a/plugins/TabSRMM/chat/services.cpp
+++ b/plugins/TabSRMM/src/chat/services.cpp
@@ -36,7 +36,7 @@
  *

  */

 

-#include "../src/commonheaders.h"

+#include "..\commonheaders.h"

 

 // defs

 extern HICON hIcons[30];

diff --git a/plugins/TabSRMM/chat/tools.cpp b/plugins/TabSRMM/src/chat/tools.cpp
index c344cc3906..7662aaf722 100644
--- a/plugins/TabSRMM/chat/tools.cpp
+++ b/plugins/TabSRMM/src/chat/tools.cpp
@@ -36,7 +36,7 @@
  *

  */

 

-#include "../src/commonheaders.h"

+#include "..\commonheaders.h"

 

 // externs

 extern HICON			hIcons[30];

diff --git a/plugins/TabSRMM/chat/window.cpp b/plugins/TabSRMM/src/chat/window.cpp
index 012cc2d9d7..77ee85f9b9 100644
--- a/plugins/TabSRMM/chat/window.cpp
+++ b/plugins/TabSRMM/src/chat/window.cpp
@@ -36,7 +36,7 @@
  *

  */

 

-#include "../src/commonheaders.h"

+#include "..\commonheaders.h"

 

 #include <tom.h>

 

diff --git a/plugins/TabSRMM/src/commonheaders.h b/plugins/TabSRMM/src/commonheaders.h
index 28a90ca0b9..83ccf13448 100644
--- a/plugins/TabSRMM/src/commonheaders.h
+++ b/plugins/TabSRMM/src/commonheaders.h
@@ -174,7 +174,7 @@
 #include <vector>

 #include <assert.h>

 

-#include "../include/resource.h"

+#include "include/resource.h"

 

 /* State of icon with such flag will not be saved, and you must set it manually */

 #define MBF_OWNERSTATE        0x04

@@ -211,7 +211,7 @@
 

 #define safe_sizeof(a) (unsigned int)((sizeof((a)) / sizeof((a)[0])))

 

-#include "../include/version.h"

+#include "include/version.h"

 #include "m_ieview.h"

 #include "m_popup2.h"

 #include "m_metacontacts.h"

@@ -225,31 +225,31 @@
 #include "m_historyevents.h"

 #include "m_smileyadd.h"

 

-#include "../include/m_cln_skinedit.h"

-#include "../include/buttonbar.h"

-#include "../include/msgs.h"

-#include "../include/msgdlgutils.h"

-#include "../include/typingnotify.h"

-#include "../include/generic_msghandlers.h"

-#include "../include/nen.h"

+#include "include/m_cln_skinedit.h"

+#include "include/buttonbar.h"

+#include "include/msgs.h"

+#include "include/msgdlgutils.h"

+#include "include/typingnotify.h"

+#include "include/generic_msghandlers.h"

+#include "include/nen.h"

 extern 	NEN_OPTIONS	nen_options;

-#include "../include/functions.h"

-#include "../chat/chat.h"

-

-#include "../include/contactcache.h"

-#include "../include/translator.h"

-#include "../include/themes.h"

-#include "../include/globals.h"

-#include "../include/mim.h"

-#include "../include/sendqueue.h"

-#include "../include/taskbar.h"

-#include "../include/controls.h"

-#include "../include/infopanel.h"

-#include "../include/sidebar.h"

-#include "../include/utils.h"

-#include "../include/sendlater.h"

-

-#include "../chat/muchighlight.h"

+#include "include/functions.h"

+#include "chat/chat.h"

+

+#include "include/contactcache.h"

+#include "include/translator.h"

+#include "include/themes.h"

+#include "include/globals.h"

+#include "include/mim.h"

+#include "include/sendqueue.h"

+#include "include/taskbar.h"

+#include "include/controls.h"

+#include "include/infopanel.h"

+#include "include/sidebar.h"

+#include "include/utils.h"

+#include "include/sendlater.h"

+

+#include "chat/muchighlight.h"

 

 #if !defined(_WIN64) && !defined(_USE_32BIT_TIME_T)

 	#define _USE_32BIT_TIME_T

diff --git a/plugins/TabSRMM/include/ImageDataObject.h b/plugins/TabSRMM/src/include/ImageDataObject.h
index 0e2c112827..0e2c112827 100644
--- a/plugins/TabSRMM/include/ImageDataObject.h
+++ b/plugins/TabSRMM/src/include/ImageDataObject.h
diff --git a/plugins/TabSRMM/include/buttonbar.h b/plugins/TabSRMM/src/include/buttonbar.h
index 9be67e965b..9be67e965b 100644
--- a/plugins/TabSRMM/include/buttonbar.h
+++ b/plugins/TabSRMM/src/include/buttonbar.h
diff --git a/plugins/TabSRMM/include/contactcache.h b/plugins/TabSRMM/src/include/contactcache.h
index 309e95131d..309e95131d 100644
--- a/plugins/TabSRMM/include/contactcache.h
+++ b/plugins/TabSRMM/src/include/contactcache.h
diff --git a/plugins/TabSRMM/include/controls.h b/plugins/TabSRMM/src/include/controls.h
index 2f6e236ca3..2f6e236ca3 100644
--- a/plugins/TabSRMM/include/controls.h
+++ b/plugins/TabSRMM/src/include/controls.h
diff --git a/plugins/TabSRMM/include/functions.h b/plugins/TabSRMM/src/include/functions.h
index 49ae0f79ab..49ae0f79ab 100644
--- a/plugins/TabSRMM/include/functions.h
+++ b/plugins/TabSRMM/src/include/functions.h
diff --git a/plugins/TabSRMM/include/generic_msghandlers.h b/plugins/TabSRMM/src/include/generic_msghandlers.h
index 4f756b24f0..4f756b24f0 100644
--- a/plugins/TabSRMM/include/generic_msghandlers.h
+++ b/plugins/TabSRMM/src/include/generic_msghandlers.h
diff --git a/plugins/TabSRMM/include/globals.h b/plugins/TabSRMM/src/include/globals.h
index 69d62f66f7..69d62f66f7 100644
--- a/plugins/TabSRMM/include/globals.h
+++ b/plugins/TabSRMM/src/include/globals.h
diff --git a/plugins/TabSRMM/include/infopanel.h b/plugins/TabSRMM/src/include/infopanel.h
index 3a2812444e..3a2812444e 100644
--- a/plugins/TabSRMM/include/infopanel.h
+++ b/plugins/TabSRMM/src/include/infopanel.h
diff --git a/plugins/TabSRMM/include/m_cln_skinedit.h b/plugins/TabSRMM/src/include/m_cln_skinedit.h
index 5ee66829c5..5ee66829c5 100644
--- a/plugins/TabSRMM/include/m_cln_skinedit.h
+++ b/plugins/TabSRMM/src/include/m_cln_skinedit.h
diff --git a/plugins/TabSRMM/include/mim.h b/plugins/TabSRMM/src/include/mim.h
index c971cb7fdf..c971cb7fdf 100644
--- a/plugins/TabSRMM/include/mim.h
+++ b/plugins/TabSRMM/src/include/mim.h
diff --git a/plugins/TabSRMM/include/msgdlgutils.h b/plugins/TabSRMM/src/include/msgdlgutils.h
index 59e349f07c..59e349f07c 100644
--- a/plugins/TabSRMM/include/msgdlgutils.h
+++ b/plugins/TabSRMM/src/include/msgdlgutils.h
diff --git a/plugins/TabSRMM/include/msgs.h b/plugins/TabSRMM/src/include/msgs.h
index 8290df99a9..5f4adef350 100644
--- a/plugins/TabSRMM/include/msgs.h
+++ b/plugins/TabSRMM/src/include/msgs.h
@@ -803,7 +803,7 @@ struct TLogIcon {
 	HBRUSH hBkgBrush;

 };

 

-#include "../icons/iconsxp/resource.h"         // icon pack values

+#include "..\TabSRMM_icons\resource.h"         // icon pack values

 

 struct TCpTable {

 	UINT cpId;

diff --git a/plugins/TabSRMM/include/nen.h b/plugins/TabSRMM/src/include/nen.h
index 106238b320..106238b320 100644
--- a/plugins/TabSRMM/include/nen.h
+++ b/plugins/TabSRMM/src/include/nen.h
diff --git a/plugins/TabSRMM/include/resource.h b/plugins/TabSRMM/src/include/resource.h
index 25f9547d0f..25f9547d0f 100644
--- a/plugins/TabSRMM/include/resource.h
+++ b/plugins/TabSRMM/src/include/resource.h
diff --git a/plugins/TabSRMM/include/sendlater.h b/plugins/TabSRMM/src/include/sendlater.h
index a81c08f4ae..a81c08f4ae 100644
--- a/plugins/TabSRMM/include/sendlater.h
+++ b/plugins/TabSRMM/src/include/sendlater.h
diff --git a/plugins/TabSRMM/include/sendqueue.h b/plugins/TabSRMM/src/include/sendqueue.h
index 8fdb8205d7..8fdb8205d7 100644
--- a/plugins/TabSRMM/include/sendqueue.h
+++ b/plugins/TabSRMM/src/include/sendqueue.h
diff --git a/plugins/TabSRMM/include/sidebar.h b/plugins/TabSRMM/src/include/sidebar.h
index 415b96c5ac..415b96c5ac 100644
--- a/plugins/TabSRMM/include/sidebar.h
+++ b/plugins/TabSRMM/src/include/sidebar.h
diff --git a/plugins/TabSRMM/include/taskbar.h b/plugins/TabSRMM/src/include/taskbar.h
index 9267f6a76a..9267f6a76a 100644
--- a/plugins/TabSRMM/include/taskbar.h
+++ b/plugins/TabSRMM/src/include/taskbar.h
diff --git a/plugins/TabSRMM/include/templates.h b/plugins/TabSRMM/src/include/templates.h
index c2b84b1cbd..c2b84b1cbd 100644
--- a/plugins/TabSRMM/include/templates.h
+++ b/plugins/TabSRMM/src/include/templates.h
diff --git a/plugins/TabSRMM/include/themes.h b/plugins/TabSRMM/src/include/themes.h
index ca899ffdb7..ca899ffdb7 100644
--- a/plugins/TabSRMM/include/themes.h
+++ b/plugins/TabSRMM/src/include/themes.h
diff --git a/plugins/TabSRMM/include/translator.h b/plugins/TabSRMM/src/include/translator.h
index 61590c6b16..61590c6b16 100644
--- a/plugins/TabSRMM/include/translator.h
+++ b/plugins/TabSRMM/src/include/translator.h
diff --git a/plugins/TabSRMM/include/typingnotify.h b/plugins/TabSRMM/src/include/typingnotify.h
index 03fb9851b7..03fb9851b7 100644
--- a/plugins/TabSRMM/include/typingnotify.h
+++ b/plugins/TabSRMM/src/include/typingnotify.h
diff --git a/plugins/TabSRMM/include/utils.h b/plugins/TabSRMM/src/include/utils.h
index b2f2dab659..b2f2dab659 100644
--- a/plugins/TabSRMM/include/utils.h
+++ b/plugins/TabSRMM/src/include/utils.h
diff --git a/plugins/TabSRMM/include/version.h b/plugins/TabSRMM/src/include/version.h
index 4390ed33dc..4390ed33dc 100644
--- a/plugins/TabSRMM/include/version.h
+++ b/plugins/TabSRMM/src/include/version.h
diff --git a/plugins/TabSRMM/tabmodplus/modplus.cpp b/plugins/TabSRMM/src/modplus.cpp
index fc6b69b292..3e9865f5f5 100644
--- a/plugins/TabSRMM/tabmodplus/modplus.cpp
+++ b/plugins/TabSRMM/src/modplus.cpp
@@ -45,7 +45,7 @@
  *

  */

 

-#include "../src/commonheaders.h"

+#include "commonheaders.h"

 

 static  HANDLE  hEventCBButtonPressed,hEventCBInit, hEventDbOptionsInit, hEventDbPluginsLoaded;

 

diff --git a/plugins/TabSRMM/tabmodplus/msgoptions_plus.cpp b/plugins/TabSRMM/src/msgoptions_plus.cpp
index 9e5994389b..e407f392d6 100644
--- a/plugins/TabSRMM/tabmodplus/msgoptions_plus.cpp
+++ b/plugins/TabSRMM/src/msgoptions_plus.cpp
@@ -35,7 +35,7 @@
  *

  */

 

-#include "../src/commonheaders.h"

+#include "commonheaders.h"

 

 extern HINSTANCE	hinstance;

 extern BOOL			g_bIMGtagButton;

diff --git a/plugins/TabSRMM/tabmodplus/icons/imgclose.ico b/plugins/TabSRMM/tabmodplus/icons/imgclose.ico
deleted file mode 100644
index 615b00a98e..0000000000
--- a/plugins/TabSRMM/tabmodplus/icons/imgclose.ico
+++ /dev/null
diff --git a/plugins/TabSRMM/tabsrmm_10.vcxproj b/plugins/TabSRMM/tabsrmm_10.vcxproj
index b28d4c936e..2a5b319242 100644
--- a/plugins/TabSRMM/tabsrmm_10.vcxproj
+++ b/plugins/TabSRMM/tabsrmm_10.vcxproj
@@ -206,16 +206,12 @@
     <ClCompile Include="src\infopanel.cpp" />

     <ClCompile Include="src\mim.cpp" />

     <ClCompile Include="src\sendlater.cpp" />

-    <ClCompile Include="tabmodplus\modplus.cpp">

-      <PrecompiledHeaderFile>../src/commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

+    <ClCompile Include="src\modplus.cpp" />

     <ClCompile Include="src\msgdialog.cpp" />

     <ClCompile Include="src\msgdlgutils.cpp" />

     <ClCompile Include="src\msglog.cpp" />

     <ClCompile Include="src\msgoptions.cpp" />

-    <ClCompile Include="tabmodplus\msgoptions_plus.cpp">

-      <PrecompiledHeaderFile>../src/commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

+    <ClCompile Include="src\msgoptions_plus.cpp" />

     <ClCompile Include="src\msgs.cpp" />

     <ClCompile Include="src\selectcontainer.cpp" />

     <ClCompile Include="src\sendqueue.cpp" />

@@ -234,128 +230,75 @@
     <ClCompile Include="src\typingnotify.cpp" />

     <ClCompile Include="src\userprefs.cpp" />

     <ClCompile Include="src\utils.cpp" />

-    <ClCompile Include="chat\clist.cpp">

-      <PrecompiledHeaderFile>../src/commonheaders.h</PrecompiledHeaderFile>

+    <ClCompile Include="src\chat\clist.cpp">

+      <PrecompiledHeaderFile>../commonheaders.h</PrecompiledHeaderFile>

     </ClCompile>

-    <ClCompile Include="chat\colorchooser.cpp">

-      <PrecompiledHeaderFile>../src/commonheaders.h</PrecompiledHeaderFile>

+    <ClCompile Include="src\chat\colorchooser.cpp">

+      <PrecompiledHeaderFile>../commonheaders.h</PrecompiledHeaderFile>

     </ClCompile>

-    <ClCompile Include="chat\log.cpp">

-      <PrecompiledHeaderFile>../src/commonheaders.h</PrecompiledHeaderFile>

+    <ClCompile Include="src\chat\log.cpp">

+      <PrecompiledHeaderFile>../commonheaders.h</PrecompiledHeaderFile>

     </ClCompile>

-    <ClCompile Include="chat\main.cpp">

-      <PrecompiledHeaderFile>../src/commonheaders.h</PrecompiledHeaderFile>

+    <ClCompile Include="src\chat\main.cpp">

+      <PrecompiledHeaderFile>../commonheaders.h</PrecompiledHeaderFile>

     </ClCompile>

-    <ClCompile Include="chat\manager.cpp">

-      <PrecompiledHeaderFile>../src/commonheaders.h</PrecompiledHeaderFile>

+    <ClCompile Include="src\chat\manager.cpp">

+      <PrecompiledHeaderFile>../commonheaders.h</PrecompiledHeaderFile>

     </ClCompile>

-    <ClCompile Include="chat\message.cpp">

-      <PrecompiledHeaderFile>../src/commonheaders.h</PrecompiledHeaderFile>

+    <ClCompile Include="src\chat\message.cpp">

+      <PrecompiledHeaderFile>../commonheaders.h</PrecompiledHeaderFile>

     </ClCompile>

-    <ClCompile Include="chat\muchighlight.cpp">

-      <PrecompiledHeaderFile>../src/commonheaders.h</PrecompiledHeaderFile>

+    <ClCompile Include="src\chat\muchighlight.cpp">

+      <PrecompiledHeaderFile>../commonheaders.h</PrecompiledHeaderFile>

     </ClCompile>

-    <ClCompile Include="chat\options.cpp">

-      <PrecompiledHeaderFile>../src/commonheaders.h</PrecompiledHeaderFile>

+    <ClCompile Include="src\chat\options.cpp">

+      <PrecompiledHeaderFile>../commonheaders.h</PrecompiledHeaderFile>

     </ClCompile>

-    <ClCompile Include="chat\services.cpp">

-      <PrecompiledHeaderFile>../src/commonheaders.h</PrecompiledHeaderFile>

+    <ClCompile Include="src\chat\services.cpp">

+      <PrecompiledHeaderFile>../commonheaders.h</PrecompiledHeaderFile>

     </ClCompile>

-    <ClCompile Include="chat\tools.cpp">

-      <PrecompiledHeaderFile>../src/commonheaders.h</PrecompiledHeaderFile>

+    <ClCompile Include="src\chat\tools.cpp">

+      <PrecompiledHeaderFile>../commonheaders.h</PrecompiledHeaderFile>

     </ClCompile>

-    <ClCompile Include="chat\window.cpp">

-      <PrecompiledHeaderFile>../src/commonheaders.h</PrecompiledHeaderFile>

+    <ClCompile Include="src\chat\window.cpp">

+      <PrecompiledHeaderFile>../commonheaders.h</PrecompiledHeaderFile>

     </ClCompile>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="chat\chat.h" />

-    <ClInclude Include="chat\chat_resource.h" />

-    <ClInclude Include="chat\chatprototypes.h" />

-    <ClInclude Include="chat\muchighlight.h" />

-    <ClInclude Include="include\resource.h" />

-    <ClInclude Include="include\sendlater.h" />

+    <ClInclude Include="src\chat\chat.h" />

+    <ClInclude Include="src\chat\chat_resource.h" />

+    <ClInclude Include="src\chat\chatprototypes.h" />

+    <ClInclude Include="src\chat\muchighlight.h" />

+    <ClInclude Include="src\include\resource.h" />

+    <ClInclude Include="src\include\sendlater.h" />

     <ClInclude Include="src\commonheaders.h" />

-    <ClInclude Include="include\contactcache.h" />

-    <ClInclude Include="include\controls.h" />

-    <ClInclude Include="include\functions.h" />

-    <ClInclude Include="include\generic_msghandlers.h" />

-    <ClInclude Include="include\globals.h" />

-    <ClInclude Include="include\ImageDataObject.h" />

-    <ClInclude Include="include\infopanel.h" />

-    <ClInclude Include="include\mim.h" />

-    <ClInclude Include="include\msgdlgutils.h" />

-    <ClInclude Include="include\msgs.h" />

-    <ClInclude Include="include\nen.h" />

-    <ClInclude Include="include\sendqueue.h" />

-    <ClInclude Include="include\sidebar.h" />

-    <ClInclude Include="include\taskbar.h" />

-    <ClInclude Include="include\templates.h" />

-    <ClInclude Include="include\themes.h" />

-    <ClInclude Include="include\translator.h" />

-    <ClInclude Include="include\typingnotify.h" />

-    <ClInclude Include="include\utils.h" />

-    <ClInclude Include="include\version.h" />

-  </ItemGroup>

-  <ItemGroup>

-    <ResourceCompile Include="chat\chat.rc" />

-    <ResourceCompile Include="msgwindow.rc" />

-    <ResourceCompile Include="resource.rc" />

+    <ClInclude Include="src\include\contactcache.h" />

+    <ClInclude Include="src\include\controls.h" />

+    <ClInclude Include="src\include\functions.h" />

+    <ClInclude Include="src\include\generic_msghandlers.h" />

+    <ClInclude Include="src\include\globals.h" />

+    <ClInclude Include="src\include\ImageDataObject.h" />

+    <ClInclude Include="src\include\infopanel.h" />

+    <ClInclude Include="src\include\mim.h" />

+    <ClInclude Include="src\include\msgdlgutils.h" />

+    <ClInclude Include="src\include\msgs.h" />

+    <ClInclude Include="src\include\nen.h" />

+    <ClInclude Include="src\include\sendqueue.h" />

+    <ClInclude Include="src\include\sidebar.h" />

+    <ClInclude Include="src\include\taskbar.h" />

+    <ClInclude Include="src\include\templates.h" />

+    <ClInclude Include="src\include\themes.h" />

+    <ClInclude Include="src\include\translator.h" />

+    <ClInclude Include="src\include\typingnotify.h" />

+    <ClInclude Include="src\include\utils.h" />

+    <ClInclude Include="src\include\version.h" />

   </ItemGroup>

   <ItemGroup>

-    <None Include="chat\Icons\1.ico" />

-    <None Include="chat\Icons\2.ico" />

-    <None Include="chat\Icons\3.ico" />

-    <None Include="chat\Icons\4.ico" />

-    <None Include="chat\Icons\5.ico" />

-    <None Include="chat\Icons\6.ico" />

-    <None Include="chat\Icons\action.ico" />

-    <None Include="chat\Icons\addmode.ico" />

-    <None Include="chat\Icons\bkgcolor.ico" />

-    <None Include="chat\Icons\blank.ico" />

-    <None Include="chat\Icons\filter.ico" />

-    <None Include="chat\Icons\filter2.ico" />

-    <None Include="chat\Icons\highlight.ico" />

-    <None Include="res\overlay_disabled.ico" />

-    <None Include="res\overlay_enabled.ico" />

-    <None Include="res\SKIN\tabskin_aero.png" />

-    <None Include="res\SKIN\tabskin_aero_button.png" />

-    <None Include="res\SKIN\tabskin_aero_glow.png" />

-    <None Include="res\SKIN\unknown.png" />

-    <None Include="tabmodplus\icons\imgclose.ico" />

-    <None Include="tabmodplus\icons\imgopen.ico" />

-    <None Include="chat\Icons\info.ico" />

-    <None Include="chat\Icons\join.ico" />

-    <None Include="chat\Icons\kick.ico" />

-    <None Include="res\leftarrow.ico" />

-    <None Include="chat\Icons\message.ico" />

-    <None Include="chat\Icons\messageout.ico" />

-    <None Include="chat\Icons\nick.ico" />

-    <None Include="chat\Icons\notice.ico" />

-    <None Include="chat\Icons\overlay.ico" />

-    <None Include="chat\Icons\part.ico" />

-    <None Include="res\res_TN\popup.ico" />

-    <None Include="res\res_TN\popup_no.ico" />

-    <None Include="res\pulldown.ico" />

-    <None Include="res\pullup.ico" />

-    <None Include="chat\Icons\quit.ico" />

-    <None Include="chat\Icons\removestatus.ico" />

-    <None Include="res\rightarrow.ico" />

-    <None Include="chat\Icons\topic.ico" />

-    <None Include="chat\Icons\topicbut.ico" />

-    <None Include="chat\Icons\window.ico" />

-    <None Include="docs\changelog.txt" />

-    <None Include="docs\INSTALL" />

-    <None Include="docs\Popups.txt" />

-    <None Include="docs\readme.txt" />

-    <None Include="skin\tabsrmm.tsk" />

+    <ResourceCompile Include="res\chat.rc" />

+    <ResourceCompile Include="res\msgwindow.rc" />

+    <ResourceCompile Include="res\resource.rc" />

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

   </ImportGroup>

-  <ProjectExtensions>

-    <VisualStudio>

-      <UserProperties RESOURCE_FILE="resource.rc" />

-    </VisualStudio>

-  </ProjectExtensions>

 </Project>
\ No newline at end of file
diff --git a/plugins/TabSRMM/tabsrmm_10.vcxproj.filters b/plugins/TabSRMM/tabsrmm_10.vcxproj.filters
index ff90ed556a..c6a1954ab4 100644
--- a/plugins/TabSRMM/tabsrmm_10.vcxproj.filters
+++ b/plugins/TabSRMM/tabsrmm_10.vcxproj.filters
@@ -63,7 +63,7 @@
     <ClCompile Include="src\mim.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="tabmodplus\modplus.cpp">

+    <ClCompile Include="src\modplus.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

     <ClCompile Include="src\msgdialog.cpp">

@@ -78,7 +78,7 @@
     <ClCompile Include="src\msgoptions.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="tabmodplus\msgoptions_plus.cpp">

+    <ClCompile Include="src\msgoptions_plus.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

     <ClCompile Include="src\msgs.cpp">

@@ -129,37 +129,37 @@
     <ClCompile Include="src\utils.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="chat\clist.cpp">

+    <ClCompile Include="src\chat\clist.cpp">

       <Filter>Source Files\Chat</Filter>

     </ClCompile>

-    <ClCompile Include="chat\colorchooser.cpp">

+    <ClCompile Include="src\chat\colorchooser.cpp">

       <Filter>Source Files\Chat</Filter>

     </ClCompile>

-    <ClCompile Include="chat\log.cpp">

+    <ClCompile Include="src\chat\log.cpp">

       <Filter>Source Files\Chat</Filter>

     </ClCompile>

-    <ClCompile Include="chat\main.cpp">

+    <ClCompile Include="src\chat\main.cpp">

       <Filter>Source Files\Chat</Filter>

     </ClCompile>

-    <ClCompile Include="chat\manager.cpp">

+    <ClCompile Include="src\chat\manager.cpp">

       <Filter>Source Files\Chat</Filter>

     </ClCompile>

-    <ClCompile Include="chat\message.cpp">

+    <ClCompile Include="src\chat\message.cpp">

       <Filter>Source Files\Chat</Filter>

     </ClCompile>

-    <ClCompile Include="chat\muchighlight.cpp">

+    <ClCompile Include="src\chat\muchighlight.cpp">

       <Filter>Source Files\Chat</Filter>

     </ClCompile>

-    <ClCompile Include="chat\options.cpp">

+    <ClCompile Include="src\chat\options.cpp">

       <Filter>Source Files\Chat</Filter>

     </ClCompile>

-    <ClCompile Include="chat\services.cpp">

+    <ClCompile Include="src\chat\services.cpp">

       <Filter>Source Files\Chat</Filter>

     </ClCompile>

-    <ClCompile Include="chat\tools.cpp">

+    <ClCompile Include="src\chat\tools.cpp">

       <Filter>Source Files\Chat</Filter>

     </ClCompile>

-    <ClCompile Include="chat\window.cpp">

+    <ClCompile Include="src\chat\window.cpp">

       <Filter>Source Files\Chat</Filter>

     </ClCompile>

     <ClCompile Include="src\sendlater.cpp">

@@ -167,237 +167,97 @@
     </ClCompile>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="chat\chat.h">

+    <ClInclude Include="src\chat\chat.h">

       <Filter>Source Files\Chat</Filter>

     </ClInclude>

-    <ClInclude Include="chat\chat_resource.h">

+    <ClInclude Include="src\chat\chat_resource.h">

       <Filter>Source Files\Chat</Filter>

     </ClInclude>

-    <ClInclude Include="chat\chatprototypes.h">

+    <ClInclude Include="src\chat\chatprototypes.h">

       <Filter>Source Files\Chat</Filter>

     </ClInclude>

-    <ClInclude Include="chat\muchighlight.h">

+    <ClInclude Include="src\chat\muchighlight.h">

       <Filter>Source Files\Chat</Filter>

     </ClInclude>

     <ClInclude Include="src\commonheaders.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="include\contactcache.h">

+    <ClInclude Include="src\include\contactcache.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="include\controls.h">

+    <ClInclude Include="src\include\controls.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="include\functions.h">

+    <ClInclude Include="src\include\functions.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="include\generic_msghandlers.h">

+    <ClInclude Include="src\include\generic_msghandlers.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="include\globals.h">

+    <ClInclude Include="src\include\globals.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="include\ImageDataObject.h">

+    <ClInclude Include="src\include\ImageDataObject.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="include\infopanel.h">

+    <ClInclude Include="src\include\infopanel.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="include\mim.h">

+    <ClInclude Include="src\include\mim.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="include\msgdlgutils.h">

+    <ClInclude Include="src\include\msgdlgutils.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="include\msgs.h">

+    <ClInclude Include="src\include\msgs.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="include\nen.h">

+    <ClInclude Include="src\include\nen.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="include\sendqueue.h">

+    <ClInclude Include="src\include\sendqueue.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="include\sidebar.h">

+    <ClInclude Include="src\include\sidebar.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="include\taskbar.h">

+    <ClInclude Include="src\include\taskbar.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="include\templates.h">

+    <ClInclude Include="src\include\templates.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="include\themes.h">

+    <ClInclude Include="src\include\themes.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="include\translator.h">

+    <ClInclude Include="src\include\translator.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="include\typingnotify.h">

+    <ClInclude Include="src\include\typingnotify.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="include\utils.h">

+    <ClInclude Include="src\include\utils.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="include\version.h">

+    <ClInclude Include="src\include\version.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="include\sendlater.h">

+    <ClInclude Include="src\include\sendlater.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="include\resource.h">

+    <ClInclude Include="src\include\resource.h">

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="chat\chat.rc">

+    <ResourceCompile Include="res\chat.rc">

       <Filter>Source Files\Chat</Filter>

     </ResourceCompile>

-    <ResourceCompile Include="msgwindow.rc">

+    <ResourceCompile Include="res\msgwindow.rc">

       <Filter>Resource Files</Filter>

     </ResourceCompile>

-    <ResourceCompile Include="resource.rc">

+    <ResourceCompile Include="res\resource.rc">

       <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

-  <ItemGroup>

-    <None Include="docs\changelog.txt">

-      <Filter>Docs</Filter>

-    </None>

-    <None Include="docs\INSTALL">

-      <Filter>Docs</Filter>

-    </None>

-    <None Include="docs\Popups.txt">

-      <Filter>Docs</Filter>

-    </None>

-    <None Include="docs\readme.txt">

-      <Filter>Docs</Filter>

-    </None>

-    <None Include="skin\tabsrmm.tsk">

-      <Filter>Docs</Filter>

-    </None>

-    <None Include="res\SKIN\tabskin_aero.png">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\SKIN\tabskin_aero_button.png">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\SKIN\tabskin_aero_glow.png">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="chat\Icons\1.ico">

-      <Filter>Resource Files\Icons</Filter>

-    </None>

-    <None Include="chat\Icons\6.ico">

-      <Filter>Resource Files\Icons</Filter>

-    </None>

-    <None Include="chat\Icons\2.ico">

-      <Filter>Resource Files\Icons</Filter>

-    </None>

-    <None Include="chat\Icons\3.ico">

-      <Filter>Resource Files\Icons</Filter>

-    </None>

-    <None Include="chat\Icons\4.ico">

-      <Filter>Resource Files\Icons</Filter>

-    </None>

-    <None Include="chat\Icons\5.ico">

-      <Filter>Resource Files\Icons</Filter>

-    </None>

-    <None Include="chat\Icons\action.ico">

-      <Filter>Resource Files\Icons</Filter>

-    </None>

-    <None Include="chat\Icons\addmode.ico">

-      <Filter>Resource Files\Icons</Filter>

-    </None>

-    <None Include="chat\Icons\bkgcolor.ico">

-      <Filter>Resource Files\Icons</Filter>

-    </None>

-    <None Include="chat\Icons\blank.ico">

-      <Filter>Resource Files\Icons</Filter>

-    </None>

-    <None Include="chat\Icons\filter.ico">

-      <Filter>Resource Files\Icons</Filter>

-    </None>

-    <None Include="chat\Icons\filter2.ico">

-      <Filter>Resource Files\Icons</Filter>

-    </None>

-    <None Include="chat\Icons\highlight.ico">

-      <Filter>Resource Files\Icons</Filter>

-    </None>

-    <None Include="res\leftarrow.ico">

-      <Filter>Resource Files\Icons</Filter>

-    </None>

-    <None Include="tabmodplus\icons\imgclose.ico">

-      <Filter>Resource Files\Icons</Filter>

-    </None>

-    <None Include="tabmodplus\icons\imgopen.ico">

-      <Filter>Resource Files\Icons</Filter>

-    </None>

-    <None Include="chat\Icons\info.ico">

-      <Filter>Resource Files\Icons</Filter>

-    </None>

-    <None Include="chat\Icons\join.ico">

-      <Filter>Resource Files\Icons</Filter>

-    </None>

-    <None Include="chat\Icons\kick.ico">

-      <Filter>Resource Files\Icons</Filter>

-    </None>

-    <None Include="chat\Icons\message.ico">

-      <Filter>Resource Files\Icons</Filter>

-    </None>

-    <None Include="chat\Icons\messageout.ico">

-      <Filter>Resource Files\Icons</Filter>

-    </None>

-    <None Include="chat\Icons\nick.ico">

-      <Filter>Resource Files\Icons</Filter>

-    </None>

-    <None Include="chat\Icons\notice.ico">

-      <Filter>Resource Files\Icons</Filter>

-    </None>

-    <None Include="res\res_TN\popup.ico">

-      <Filter>Resource Files\Icons</Filter>

-    </None>

-    <None Include="chat\Icons\overlay.ico">

-      <Filter>Resource Files\Icons</Filter>

-    </None>

-    <None Include="res\overlay_disabled.ico">

-      <Filter>Resource Files\Icons</Filter>

-    </None>

-    <None Include="res\overlay_enabled.ico">

-      <Filter>Resource Files\Icons</Filter>

-    </None>

-    <None Include="chat\Icons\part.ico">

-      <Filter>Resource Files\Icons</Filter>

-    </None>

-    <None Include="res\res_TN\popup_no.ico">

-      <Filter>Resource Files\Icons</Filter>

-    </None>

-    <None Include="res\pulldown.ico">

-      <Filter>Resource Files\Icons</Filter>

-    </None>

-    <None Include="res\pullup.ico">

-      <Filter>Resource Files\Icons</Filter>

-    </None>

-    <None Include="chat\Icons\quit.ico">

-      <Filter>Resource Files\Icons</Filter>

-    </None>

-    <None Include="chat\Icons\removestatus.ico">

-      <Filter>Resource Files\Icons</Filter>

-    </None>

-    <None Include="res\rightarrow.ico">

-      <Filter>Resource Files\Icons</Filter>

-    </None>

-    <None Include="chat\Icons\topic.ico">

-      <Filter>Resource Files\Icons</Filter>

-    </None>

-    <None Include="chat\Icons\topicbut.ico">

-      <Filter>Resource Files\Icons</Filter>

-    </None>

-    <None Include="chat\Icons\window.ico">

-      <Filter>Resource Files\Icons</Filter>

-    </None>

-    <None Include="res\SKIN\unknown.png">

-      <Filter>Resource Files</Filter>

-    </None>

-  </ItemGroup>

 </Project>
\ No newline at end of file