3 files changed, 12 insertions, 9 deletions
diff --git a/plugins/Watrack/status/status.pas b/plugins/Watrack/status/status.pas
index 7eef03bb14..cc52e6e1d1 100644
--- a/plugins/Watrack/status/status.pas
+++ b/plugins/Watrack/status/status.pas
@@ -10,6 +10,8 @@ uses
   common,m_api,mirutils,mircontacts,protocols,dbsettings,wrapper,
   global,wat_api,hlpdlg,CBEx,myRTF,Tmpl;
 
+{$include resource.inc}
+
 const
   HKN_INSERT:PansiChar = 'WAT_Insert';
 
@@ -103,19 +105,19 @@ begin
     count:=2;
   case count of
     2: begin
-      tmpl:='COMMON';
+      tmpl:=PAnsiChar(IDD_OPT_COMMON);
       proc:=@DlgProcOptions3;
       name:='Status (common)';
     end;
     1: begin
       if SimpleMode=BST_UNCHECKED then
       begin
-        tmpl:='TEMPLATE11';
+        tmpl:=PAnsiChar(IDD_OPT_TEMPLATE11);
         proc:=@DlgProcOptions11;
       end
       else
       begin
-        tmpl:='TEMPLATE12';
+        tmpl:=PAnsiChar(IDD_OPT_TEMPLATE12);
         proc:=@DlgProcOptions12;
       end;
       name:='Status (templates)';
diff --git a/plugins/Watrack/status/status.rc b/plugins/Watrack/status/status.rc
index 3b95cd8913..838c12201a 100644
--- a/plugins/Watrack/status/status.rc
+++ b/plugins/Watrack/status/status.rc
@@ -1,9 +1,10 @@
 #include "i_st_rc.inc"
+#include "resource.inc"
 
 LANGUAGE 0,0
 
-COMMON DIALOGEX 0, 0, 304, 226, 0
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE
+IDD_OPT_COMMON DIALOGEX 0, 0, 304, 226, 0
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 0, 0
 {
@@ -24,8 +25,8 @@ FONT 8, "MS Shell Dlg", 0, 0
  COMBOBOX IDC_SETXSTATUS, 14, 166, 174, 96, CBS_DROPDOWNLIST | WS_VSCROLL
 }
 
-TEMPLATE11 DIALOGEX 0, 0, 304, 226, 0
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE
+IDD_OPT_TEMPLATE11 DIALOGEX 0, 0, 304, 226, 0
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 0, 0
 {
@@ -64,8 +65,8 @@ FONT 8, "MS Shell Dlg", 0, 0
                  WS_GROUP | WS_TABSTOP | WS_VSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST, 186, 88, 112, 100
 }
 
-TEMPLATE12 DIALOGEX 0, 0, 304, 226, 0
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE
+IDD_OPT_TEMPLATE12 DIALOGEX 0, 0, 304, 226, 0
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 0, 0
 {
diff --git a/plugins/Watrack/status/status.res b/plugins/Watrack/status/status.res
index c070e2e1d4..a32546637a 100644
--- a/plugins/Watrack/status/status.res
+++ b/plugins/Watrack/status/status.res