diff --git a/www/extras/htmlArea/popups/macros.html b/www/extras/htmlArea/popups/macros.html
index fc67b00b4..8fc3f6863 100644
--- a/www/extras/htmlArea/popups/macros.html
+++ b/www/extras/htmlArea/popups/macros.html
@@ -34,22 +34,24 @@ function returnSelected(in_values) {
 
 <select name="textPulldown" onchange="returnSelected(this.value)">
 <option value=''>Navigation...</option>
-<option value='^C;'>Crumb Trail</option>
-<option value='^FlexMenu;'>FlexMenu</option>
-<option value='^M;'>Current Menu (Vertical)</option>
-<option value='^m;'>Current Menu (Horizontal)</option>
-<option value='^P;'>Previous Menu (Vertical)</option>
-<option value='^p;'>Previous Menu (Horizontal)</option>
-<option value='^PreviousDropMenu;'>Previous Dropdown Menu</option>
-<option value='^S("home",0);'>Specific SubMenu (Vertical)</option>
-<option value='^s("home");'>Specific SubMenu (Horizontal)</option>
-<option value='^SpecificDropMenu("home",3);'>Specific Dropdown Menu</option>
+<option value='^Navigation(crumbTrail);'>Crumb Trail</option>
+<option value='^Navigation(FlexMenu);'>FlexMenu</option>
+<option value='^Navigation(dtree);'>Dynamic Tree</option>
+<option value='^Navigation(coolmenu);'>Cool Menu (Horizontal)</option>
+<option value='^Navigation(currentMenuVertical);'>Current Menu (Vertical)</option>
+<option value='^Navigation(currentMenuHorizontal);'>Current Menu (Horizontal)</option>
+<option value='^Navigation(previousMenuVertical);'>Previous Menu (Vertical)</option>
+<option value='^Navigation(previousMenuHorizontal);'>Previous Menu (Horizontal)</option>
+<option value='^Navigation(PreviousDropMenu);'>Previous Dropdown Menu</option>
+<option value='^Navigation(SpecificMenuVertical);'>Specific SubMenu (Vertical)</option>
+<option value='^Navigation(SpecificMenuHorizontal);'>Specific SubMenu (Horizontal)</option>
+<option value='^Navigation(SpecificDropMenu);'>Specific Dropdown Menu</option>
 <option value='^Synopsis;'>Synopsis Menu</option>
-<option value='^T;'>Top Level Menu (Vertical)</option>
-<option value='^t;'>Top Level Menu (Horizontal)</option>
-<option value='^TopDropMenu;'>Top Dropdown Menu</option>
-<option value='^RootTab;'>Root Tabs Menu</option>
-<option value='^rootmenu;'>Root Menu (Horizontal)</option>
+<option value='^Navigation(TopLevelMenuVertical);'>Top Level Menu (Vertical)</option>
+<option value='^Navigation(TopLevelMenuHorizontal);'>Top Level Menu (Horizontal)</option>
+<option value='^Navigation(TopDropMenu);'>Top Dropdown Menu</option>
+<option value='^Navigation(RootTab);'>Root Tabs Menu</option>
+<option value='^Navigation(rootmenu);'>Root Menu (Horizontal)</option>
 <option value='^H;'>Home Link</option>
 <option value='^/;'>System URL</option>
 <option value='^\;'>Current Page URL</option>