6 files changed, 8 insertions, 8 deletions
diff --git a/plugins/Watrack/i_gui.inc b/plugins/Watrack/i_gui.inc
index 81e4c35beb..fa10a41062 100644
--- a/plugins/Watrack/i_gui.inc
+++ b/plugins/Watrack/i_gui.inc
@@ -34,7 +34,7 @@ var
   mi:TCListMenuItem;
 begin
   FillChar(mi, sizeof(mi), 0);
-  mi.szPopupName.a:=PluginShort;
+  mi.hParentMenu:=Menu_CreateRoot(MO_MAIN, 'Watrack', 0, 0, 0);
 
   mi.hIcon     :=IcoLib_GetIcon(IcoBtnEnable,0);
   mi.szName.a  :='Disable WATrack';
diff --git a/plugins/Watrack/lastfm/lastfm.pas b/plugins/Watrack/lastfm/lastfm.pas
index ae56647617..8cb51a855c 100644
--- a/plugins/Watrack/lastfm/lastfm.pas
+++ b/plugins/Watrack/lastfm/lastfm.pas
@@ -181,12 +181,12 @@ begin
   DestroyIcon(sid.hDefaultIcon);
 
   FillChar(mi, sizeof(mi), 0);
-  mi.szPopupName.a:=PluginShort;
+  mi.hParentMenu:=Menu_CreateRoot(MO_MAIN, 'Watrack', 500050000, 0, 0);
 
   mi.hIcon     :=IcoLib_GetIcon(IcoLastFM,0);
   mi.szName.a  :='Disable scrobbling';
   mi.pszService:=MS_WAT_LASTFM;
-  mi.position  :=500050000; // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+  mi.position  :=500050000;
   hMenuLast:=Menu_AddMainMenuItem(@mi);
 end;
 
diff --git a/plugins/Watrack/myshows/myshows.pas b/plugins/Watrack/myshows/myshows.pas
index e6c5c6cb21..054d9a6010 100644
--- a/plugins/Watrack/myshows/myshows.pas
+++ b/plugins/Watrack/myshows/myshows.pas
@@ -212,7 +212,7 @@ begin
   DestroyIcon(sid.hDefaultIcon);
 
   FillChar(mi, sizeof(mi), 0);
-  mi.szPopupName.a:=PluginShort;
+  mi.hParentMenu:=Menu_CreateRoot(MO_MAIN, 'Watrack', 500050000, 0, 0);
 
   mi.hIcon     :=IcoLib_GetIcon(IcoMyShows,0);
   mi.szName.a  :='Disable scrobbling';
diff --git a/plugins/Watrack/popup/popups.pas b/plugins/Watrack/popup/popups.pas
index cd548e9e88..a75264cf7c 100644
--- a/plugins/Watrack/popup/popups.pas
+++ b/plugins/Watrack/popup/popups.pas
@@ -473,7 +473,7 @@ begin
   HookEvent(ME_SKIN2_ICONSCHANGED,@IconChanged);
 
   FillChar(mi,SizeOf(mi),0);
-  mi.szPopupName.a:=PluginShort;
+  mi.hParentMenu:=Menu_CreateRoot(MO_MAIN, 'Watrack', MenuInfoPos, 0, 0);
   mi.hIcon     :=IcoLib_GetIcon(IcoBtnInfo,0);
   mi.szName.a  :='Music Info';
   mi.pszService:=MS_WAT_SHOWMUSICINFO;
diff --git a/plugins/Watrack/proto/proto.pas b/plugins/Watrack/proto/proto.pas
index 2d4e488d41..25408aeba0 100644
--- a/plugins/Watrack/proto/proto.pas
+++ b/plugins/Watrack/proto/proto.pas
@@ -354,7 +354,7 @@ begin
   RegisterIcons;
 
   FillChar(mi, sizeof(mi), 0);
-  mi.szPopupName.a:=PluginShort;
+  mi.hParentMenu:=Menu_CreateRoot(MO_MAIN, 'Watrack', 0, 0, 0);
   mi.flags        :=CMIF_NOTOFFLINE or CMIF_NOTOFFLIST;
   mi.hIcon        :=IcoLib_GetIcon(IcoBtnContext,0);
   mi.szName.a     :='Get user''s Music Info';
diff --git a/plugins/Watrack/stat/statlog.pas b/plugins/Watrack/stat/statlog.pas
index ea6b5baf54..fe5418017f 100644
--- a/plugins/Watrack/stat/statlog.pas
+++ b/plugins/Watrack/stat/statlog.pas
@@ -582,11 +582,11 @@ begin
   DestroyIcon(sid.hDefaultIcon);
 
   FillChar(mi, sizeof(mi), 0);
-  mi.szPopupName.a:=PluginShort;
+  mi.hParentMenu:=Menu_CreateRoot(MO_MAIN, 'Watrack', MenuReportPos, 0, 0);
   mi.hIcon     :=IcoLib_GetIcon(IcoBtnReport,0);
   mi.szName.a  :='Create WATrack report';
   mi.pszService:=MS_WAT_MAKEREPORT;
-  mi.position  :=MenuReportPos; // !!!!!!!!!!!!!!!!!!!!!
+  mi.position  :=MenuReportPos;
   hMenuReport:=Menu_AddMainMenuItem(@mi);
   plStatusHook:=HookEvent(ME_WAT_NEWSTATUS,@NewPlStatus);
 end;