diff -Naur setup-0.3.1.org/Makefile setup-0.3.1/Makefile
--- setup-0.3.1.org/Makefile	2005-10-16 08:27:03.000000000 -0400
+++ setup-0.3.1/Makefile	2007-10-01 19:01:43.000000000 -0400
@@ -31,7 +31,7 @@
 
 ### The version number of VDR (taken from VDR's "config.h"):
 
-VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
 
 ### The name of the distribution archive:
 
@@ -82,7 +82,7 @@
 
 libvdr-$(PLUGIN).so: setupsystemmenu.cpp $(OBJS) 
 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
-	@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
+	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
 
 setupsystemmenu.cpp:  ../../../menu.c
 	@echo "Extracting class definitions from VDR's menu.c for standard Setup"
diff -Naur setup-0.3.1.org/menus.h setup-0.3.1/menus.h
--- setup-0.3.1.org/menus.h	2006-03-05 04:47:26.000000000 -0500
+++ setup-0.3.1/menus.h	2007-10-02 20:05:07.000000000 -0400
@@ -101,7 +101,7 @@
   public:
     MenuEntryValueList();
     ~MenuEntryValueList();
-    MenuEntryValueList const &MenuEntryValueList::operator =(MenuEntryValueList const &right   );
+    MenuEntryValueList const &operator =(MenuEntryValueList const &right   );
     void copy(MenuEntryValueList const &other);
     void destroy();
     void Add(const char *value);
@@ -132,9 +132,9 @@
     MenuEntry();
     ~MenuEntry();
     void destroy();
-    bool MenuEntry::AddEntry( TiXmlNode *node  );
-    bool MenuEntry::AddSubEntry( TiXmlNode *node  );
-    bool MenuEntry::AddSelectionValues( TiXmlNode *node, const char *selection);
+    bool AddEntry( TiXmlNode *node  );
+    bool AddSubEntry( TiXmlNode *node  );
+    bool AddSelectionValues( TiXmlNode *node, const char *selection);
     TiXmlNode *SaveXml( );
     void SetSysconfigName(const char* nam);
     const char*GetSysconfigName();
diff -Naur setup-0.3.1.org/plugins.h setup-0.3.1/plugins.h
--- setup-0.3.1.org/plugins.h	2005-10-12 09:44:14.000000000 -0400
+++ setup-0.3.1/plugins.h	2007-10-02 20:03:38.000000000 -0400
@@ -33,20 +33,20 @@
     bool operator< (Plugin &param);
     bool operator> (Plugin &param);
     void Print();
-    const char* Plugin::GetName();
-    const char* Plugin::GetInfo();
-    const char* Plugin::GetParameter();
-    void Plugin::SetName(const char* name);
-    void Plugin::SetInfo(const char* info);
-    void Plugin::SetParameter(const char* parameter);
-    void Plugin::SetActive(int flag);
-    void Plugin::SetProtect(bool protect);
-    int  Plugin::GetActive();
-    int  *Plugin::GetActiveRef();
-    void Plugin::SetInSystem(bool flag);
-    bool Plugin::GetInSystem();
-    bool Plugin::GetProtect();
-    const char* Plugin::GetActiveString();
+    const char* GetName();
+    const char* GetInfo();
+    const char* GetParameter();
+    void SetName(const char* name);
+    void SetInfo(const char* info);
+    void SetParameter(const char* parameter);
+    void SetActive(int flag);
+    void SetProtect(bool protect);
+    int  GetActive();
+    int  *GetActiveRef();
+    void SetInSystem(bool flag);
+    bool GetInSystem();
+    bool GetProtect();
+    const char* GetActiveString();
 };
 
 class Plugins  : public cList<Plugin> 
diff -Naur setup-0.3.1.org/setup.cpp setup-0.3.1/setup.cpp
--- setup-0.3.1.org/setup.cpp	2006-03-06 14:16:41.000000000 -0500
+++ setup-0.3.1/setup.cpp	2007-10-01 19:01:43.000000000 -0400
@@ -15,8 +15,8 @@
 #include "i18n.h"
 
 static const char *VERSION        = "0.3.1";
-static const char *DESCRIPTION    = "Minivdr-Setup";
-static const char *MAINMENUENTRY  = "Minivdr-Setup";
+static const char *DESCRIPTION    = "System-Setup";
+static const char *MAINMENUENTRY  = "System-Setup";
 
 //holds setup configuration
 cSetupSetup  setupSetup;
diff -Naur setup-0.3.1.org/setupmenu.cpp setup-0.3.1/setupmenu.cpp
--- setup-0.3.1.org/setupmenu.cpp	2006-03-05 04:47:26.000000000 -0500
+++ setup-0.3.1/setupmenu.cpp	2007-10-01 19:53:18.000000000 -0400
@@ -20,7 +20,7 @@
 #include "i18n.h"
 #include "setupsetup.h"
 #include "setupsystemmenu.h"
-
+#include <shutdown.h>
 
 
 //#################################################################################################
@@ -699,7 +699,7 @@
 //#############################################################################################
 
 
-cSetupMenu::cSetupMenu() : cOsdMenu(tr("Setup - designed for minivdr.de (c)"))
+cSetupMenu::cSetupMenu() : cOsdMenu(tr("System Setup"))
 {
    char *configFile=NULL;
 
@@ -856,7 +856,7 @@
             case kYellow:
                         if (Interface->Confirm(cRecordControls::Active() ? tr("Recording - restart anyway?") : tr("Really restart?")))
                         {
-                          cThread::EmergencyExit(true);
+                          ShutdownHandler.RequestEmergencyExit();
                           return osEnd;
                         }
                         return osContinue;
@@ -864,7 +864,7 @@
             case kBlue:
                         if (Interface->Confirm(cRecordControls::Active() ? tr("Recording - restart anyway?") : tr("Really reboot?")))
                         {
-                          cThread::EmergencyExit(true);
+                          ShutdownHandler.RequestEmergencyExit();
                           system(_config->GetBootLinux());
                         }
                         return osContinue;