diff -ruN vdr-1/Makefile vdr-2/Makefile
--- vdr-1/Makefile	2012-09-10 22:16:58.000000000 +0200
+++ vdr-2/Makefile	2012-09-10 22:17:43.000000000 +0200
@@ -199,7 +199,7 @@
 	@failed="";\
 	noapiv="";\
 	for i in `ls $(PLUGINDIR)/src | grep -v '[^a-z0-9]'`; do\
-	    echo "Plugin $$i:";\
+	    true echo "Plugin $$i:";\
 	    if ! grep -q "\$$(LIBDIR)/.*\$$(APIVERSION)" "$(PLUGINDIR)/src/$$i/Makefile" ; then\
 	       echo "ERROR: plugin $$i doesn't honor APIVERSION - not compiled!";\
 	       noapiv="$$noapiv $$i";\
diff -ruN vdr-1/menu.c vdr-2/menu.c
--- vdr-1/menu.c	2012-09-10 22:16:58.000000000 +0200
+++ vdr-2/menu.c	2012-09-10 22:17:43.000000000 +0200
@@ -3927,7 +3927,7 @@
 {
   Clear();
   char buffer[64];
-  snprintf(buffer, sizeof(buffer), "%s - VDR %s", tr("Setup"), VDRVERSION);
+  snprintf(buffer, sizeof(buffer), "%s - VDR %s", tr("VDR Setup"), VDRVERSION);
   SetTitle(buffer);
   SetHasHotkeys();
   Add(new cOsdItem(hk(tr("OSD")),           osUser1));
@@ -4006,9 +4006,9 @@
 {
 #ifdef USE_SETUP
   // Load Menu Configuration
-  cString menuXML = cString::sprintf("%s/setup/vdr-menu.%s.xml", cPlugin::ConfigDirectory(), Setup.OSDLanguage);
+  cString menuXML = cString::sprintf("%s/../menu.%s.xml", cPlugin::ConfigDirectory(), Setup.OSDLanguage);
   if (access(menuXML, 04) == -1)
-     menuXML = cString::sprintf("%s/setup/vdr-menu.xml", cPlugin::ConfigDirectory());
+     menuXML = cString::sprintf("%s/../menu.xml", cPlugin::ConfigDirectory());
   subMenu.LoadXml(menuXML);
   nrDynamicMenuEntries = 0;
 #endif /* SETUP */
@@ -4162,7 +4162,7 @@
          else if (strcmp(item, "Recordings") == 0)
             Add(new cOsdItem(hk(tr("Recordings")), osRecordings));
          else if (strcmp(item, "Setup") == 0) {
-            cString itemSetup = cString::sprintf("%s%s", tr("Setup"), *subMenu.GetMenuSuffix());
+            cString itemSetup = cString::sprintf("%s%s", tr("VDR Setup"), *subMenu.GetMenuSuffix());
             Add(new cOsdItem(hk(itemSetup), osSetup));
             }
          else if (strcmp(item, "Commands") == 0 && Commands.Count() > 0) {
@@ -4213,9 +4213,9 @@
   // More basic menu items:
 
 #ifdef USE_PINPLUGIN
-  if (!cStatus::MsgMenuItemProtected("Setup", true)) Add(new cOsdItem(hk(tr("Setup")), osSetup));
+  if (!cStatus::MsgMenuItemProtected("Setup", true)) Add(new cOsdItem(hk(tr("VDR Setup")), osSetup));
 #else
-  Add(new cOsdItem(hk(tr("Setup")),      osSetup));
+  Add(new cOsdItem(hk(tr("VDR Setup")),      osSetup));
 #endif /* PINPLUGIN */
   if (Commands.Count())
 #ifdef USE_PINPLUGIN
diff -ruN vdr-1/menuitems.c vdr-2/menuitems.c
--- vdr-1/menuitems.c	2012-04-08 13:20:37.000000000 +0200
+++ vdr-2/menuitems.c	2012-09-10 22:17:43.000000000 +0200
@@ -1132,7 +1132,7 @@
 
 void cMenuSetupPage::SetSection(const char *Section)
 {
-  SetTitle(cString::sprintf("%s - %s", tr("Setup"), Section));
+  SetTitle(cString::sprintf("%s - %s", tr("VDR Setup"), Section));
 }
 
 eOSState cMenuSetupPage::ProcessKey(eKeys Key)
diff -ruN vdr-1/submenu.c vdr-2/submenu.c
--- vdr-1/submenu.c	2012-09-10 22:16:58.000000000 +0200
+++ vdr-2/submenu.c	2012-09-10 22:17:43.000000000 +0200
@@ -446,10 +446,6 @@
   if ((ok = xmlDoc.LoadFile())) {
      if ((root = xmlDoc.FirstChildElement("menus")) != NULL) {
         cString tmp = root->Attribute("suffix");
-#ifdef USE_WAREAGLEICON
-        if      (strcmp(tmp, "ICON_FOLDER") == 0)      tmp = cString::sprintf(" %s", IsLangUtf8() ? ICON_FOLDER_UTF8 : ICON_FOLDER);
-        else if (strcmp(tmp, "ICON_MOVE_FOLDER") == 0) tmp = cString::sprintf(" %s", IsLangUtf8() ? ICON_MOVE_FOLDER_UTF8 : ICON_MOVE_FOLDER);
-#endif /* WAREAGLEICON */
         if (*tmp)
            _menuSuffix = tmp;
         else