8 files changed, 15 insertions, 7 deletions
diff --git a/plugins/Watrack/i_opt_dlg.inc b/plugins/Watrack/i_opt_dlg.inc
index 5721158705..52848bf86b 100644
--- a/plugins/Watrack/i_opt_dlg.inc
+++ b/plugins/Watrack/i_opt_dlg.inc
@@ -26,13 +26,13 @@ begin
   odp.szGroup.a  :='Plugins';
 
   odp.flags      :=ODPF_BOLDGROUPS;
-  odp.pszTemplate:='PARTS';
+  odp.pszTemplate:=PAnsiChar(IDD_OPT_PARTS);
   odp.pfnDlgProc :=@DlgProcOptions0;
   odp.szTab.a    :='Modules';
   CallService(MS_OPT_ADDPAGE,wParam,tlparam(@odp));
 
   odp.flags      :=ODPF_BOLDGROUPS;
-  odp.pszTemplate:='BASIC';
+  odp.pszTemplate:=PAnsiChar(IDD_OPT_BASIC);
   odp.pfnDlgProc :=@DlgProcOptions1;
   odp.szTab.a    :='Basic';
   CallService(MS_OPT_ADDPAGE,wParam,tlparam(@odp));
diff --git a/plugins/Watrack/popup/popup.rc b/plugins/Watrack/popup/popup.rc
index ae05c73860..c23ebe1d1b 100644
--- a/plugins/Watrack/popup/popup.rc
+++ b/plugins/Watrack/popup/popup.rc
@@ -1,8 +1,9 @@
 #include "pop_rc.inc"
+#include "resource.inc"
 
 LANGUAGE 0,0
 
-POPUP DIALOGEX 0, 0, 304, 226, 0
+IDD_OPT_POPUP DIALOGEX 0, 0, 304, 226, 0
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 400, 0
diff --git a/plugins/Watrack/popup/popup.res b/plugins/Watrack/popup/popup.res
index 9365b0aa7f..c69bb84793 100644
--- a/plugins/Watrack/popup/popup.res
+++ b/plugins/Watrack/popup/popup.res
diff --git a/plugins/Watrack/popup/popups.pas b/plugins/Watrack/popup/popups.pas
index 2aca70bc74..ec21e11f5d 100644
--- a/plugins/Watrack/popup/popups.pas
+++ b/plugins/Watrack/popup/popups.pas
@@ -20,6 +20,7 @@ const
 {$include pop_rc.inc}
 {$include pop_vars.inc}
 {$include pop_opt.inc}
+{$include resource.inc}
 
 const
   MainTmpl = 'artist: %ls'#13#10'title: "%ls"'#13#10'album: "%ls"'#13#10+
@@ -369,7 +370,7 @@ begin
   odp.szTitle.a  :=PluginName;
 
   odp.szGroup.a  :='Popups';
-  odp.pszTemplate:=DLGPOPUP;
+  odp.pszTemplate:=PAnsiChar(IDD_OPT_POPUP);
   odp.pfnDlgProc :=@DlgPopupOpt;
   CallService(MS_OPT_ADDPAGE,wParam,tlparam(@odp));
   result:=0;
diff --git a/plugins/Watrack/res/watrack.rc b/plugins/Watrack/res/watrack.rc
index 8017c3494f..b148ae6e98 100644
--- a/plugins/Watrack/res/watrack.rc
+++ b/plugins/Watrack/res/watrack.rc
@@ -1,8 +1,9 @@
 #include "i_const.inc"
+#include "resource.inc"
 
 LANGUAGE 0,0
 
-BASIC DIALOGEX 0, 0, 304, 226, 0
+IDD_OPT_BASIC DIALOGEX 0, 0, 304, 226, 0
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 0, 0
@@ -62,8 +63,8 @@ FONT 8, "MS Shell Dlg", 0, 0
 IDI_PLUGIN_ENABLE  ICON "wat_enable.ico"
 IDI_PLUGIN_DISABLE ICON "wat_disable.ico"
 
-PARTS DIALOGEX 0, 0, 304, 226, 0
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE
+IDD_OPT_PARTS 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/res/watrack.res b/plugins/Watrack/res/watrack.res
index 49df939baa..205aeb05ce 100644
--- a/plugins/Watrack/res/watrack.res
+++ b/plugins/Watrack/res/watrack.res
diff --git a/plugins/Watrack/resource.inc b/plugins/Watrack/resource.inc
new file mode 100644
index 0000000000..19fd5492c2
--- /dev/null
+++ b/plugins/Watrack/resource.inc
@@ -0,0 +1,4 @@
+const
+  IDD_OPT_BASIC = 201;
+  IDD_OPT_PARTS = 202;
+  IDD_OPT_POPUP = 203;
diff --git a/plugins/Watrack/watrack.dpr b/plugins/Watrack/watrack.dpr
index 54f3fbe986..c122d50e77 100644
--- a/plugins/Watrack/watrack.dpr
+++ b/plugins/Watrack/watrack.dpr
@@ -29,6 +29,7 @@ uses
 ;
 
 {$include res\i_const.inc}
+{$include resource.inc}
 
 {$Resource res\watrack.res}