diff --git a/src/gui/adzap.cpp b/src/gui/adzap.cpp
index 6f9315160..6d40e5004 100644
--- a/src/gui/adzap.cpp
+++ b/src/gui/adzap.cpp
@@ -31,9 +31,9 @@
 #include <stdlib.h>
 #include <global.h>
 #include <neutrino.h>
-#include <mymenu.h>
 #include <algorithm>
 #include <gui/adzap.h>
+#include <gui/widget/menue_options.h>
 #include <gui/widget/hintbox.h>
 #include <eitd/sectionsd.h>
 #include <driver/screen_max.h>
diff --git a/src/gui/audio_select.cpp b/src/gui/audio_select.cpp
index d2aae62c7..2978386f0 100644
--- a/src/gui/audio_select.cpp
+++ b/src/gui/audio_select.cpp
@@ -36,9 +36,9 @@
 
 #include <global.h>
 #include <neutrino.h>
-#include <mymenu.h>
 #include <gui/widget/icons.h>
 #include <gui/widget/menue.h>
+#include <gui/widget/menue_options.h>
 #include <driver/screen_max.h>
 #include <driver/volume.h>
 #include <zapit/zapit.h>
diff --git a/src/gui/audio_setup.cpp b/src/gui/audio_setup.cpp
index 70fbaf400..9b7e4496d 100644
--- a/src/gui/audio_setup.cpp
+++ b/src/gui/audio_setup.cpp
@@ -37,9 +37,9 @@
 
 #include <global.h>
 #include <neutrino.h>
-#include <mymenu.h>
 
 #include <gui/widget/icons.h>
+#include <gui/widget/menue_options.h>
 #include <gui/widget/stringinput.h>
 
 #include <driver/screen_max.h>
diff --git a/src/gui/audioplayer_setup.cpp b/src/gui/audioplayer_setup.cpp
index ba3178117..339fcb3a7 100644
--- a/src/gui/audioplayer_setup.cpp
+++ b/src/gui/audioplayer_setup.cpp
@@ -38,10 +38,10 @@
 
 #include <global.h>
 #include <neutrino.h>
-#include <mymenu.h>
 #include <neutrino_menue.h>
 
 #include <gui/widget/icons.h>
+#include <gui/widget/menue_options.h>
 #include <gui/widget/stringinput.h>
 
 #include <gui/audioplayer.h>
diff --git a/src/gui/bouquetlist.cpp b/src/gui/bouquetlist.cpp
index 3486f1609..00802de69 100644
--- a/src/gui/bouquetlist.cpp
+++ b/src/gui/bouquetlist.cpp
@@ -36,6 +36,7 @@
 
 #include <gui/components/cc.h>
 #include <gui/widget/menue.h>
+#include <gui/widget/menue_options.h>
 #include <gui/widget/buttons.h>
 #include <gui/widget/icons.h>
 #include <gui/widget/msgbox.h>
@@ -53,7 +54,6 @@
 
 #include <global.h>
 #include <neutrino.h>
-#include <mymenu.h>
 #include <zapit/getservices.h>
 
 #ifdef ENABLE_LCD4LINUX
diff --git a/src/gui/cam_menu.cpp b/src/gui/cam_menu.cpp
index 9dffb5d2e..0e7f83f13 100644
--- a/src/gui/cam_menu.cpp
+++ b/src/gui/cam_menu.cpp
@@ -40,6 +40,7 @@
 #include <global.h>
 #include <neutrino.h>
 #include "widget/icons.h"
+#include "widget/menue_options.h"
 #include "widget/stringinput.h"
 
 #include "widget/progresswindow.h"
@@ -48,7 +49,6 @@
 #include <system/settings.h>
 #include <system/debug.h>
 
-#include <mymenu.h>
 #include <eitd/edvbstring.h>
 #include <zapit/capmt.h>
 #include <zapit/zapit.h>
diff --git a/src/gui/cec_setup.cpp b/src/gui/cec_setup.cpp
index 3775c206d..f87a790db 100644
--- a/src/gui/cec_setup.cpp
+++ b/src/gui/cec_setup.cpp
@@ -35,10 +35,10 @@
 
 #include <global.h>
 #include <neutrino.h>
-#include <mymenu.h>
 #include <neutrino_menue.h>
 
 #include <gui/widget/icons.h>
+#include <gui/widget/menue_options.h>
 
 #include <driver/screen_max.h>
 
diff --git a/src/gui/glcdsetup.cpp b/src/gui/glcdsetup.cpp
index 0f3fbd097..b61969b22 100644
--- a/src/gui/glcdsetup.cpp
+++ b/src/gui/glcdsetup.cpp
@@ -34,7 +34,7 @@
 #include <driver/screen_max.h>
 #include <system/helpers.h>
 #include "glcdsetup.h"
-#include <mymenu.h>
+#include <gui/widget/menue_options.h>
 #include <gui/widget/colorchooser.h>
 #include <neutrino_menue.h>
 #include "glcdthemes.h"
diff --git a/src/gui/hdd_menu.cpp b/src/gui/hdd_menu.cpp
index c8cafd68a..e3ca0dffe 100644
--- a/src/gui/hdd_menu.cpp
+++ b/src/gui/hdd_menu.cpp
@@ -49,6 +49,7 @@
 
 #include <cs_api.h>
 #include <gui/widget/icons.h>
+#include <gui/widget/menue_options.h>
 #include <gui/widget/stringinput.h>
 #include <gui/widget/msgbox.h>
 #include <gui/widget/hintbox.h>
@@ -59,7 +60,6 @@
 #include <system/settings.h>
 #include <system/debug.h>
 
-#include <mymenu.h>
 #include <driver/screen_max.h>
 #include <driver/record.h>
 
diff --git a/src/gui/keybind_setup.cpp b/src/gui/keybind_setup.cpp
index 9e87dab6f..f5e0e4705 100644
--- a/src/gui/keybind_setup.cpp
+++ b/src/gui/keybind_setup.cpp
@@ -39,10 +39,10 @@
 
 #include <global.h>
 #include <neutrino.h>
-#include <mymenu.h>
 #include <neutrino_menue.h>
 
 #include <gui/widget/icons.h>
+#include <gui/widget/menue_options.h>
 #include <gui/widget/msgbox.h>
 #include <gui/widget/stringinput.h>
 #include <gui/widget/keyboard_input.h>
diff --git a/src/gui/lcd4l_setup.cpp b/src/gui/lcd4l_setup.cpp
index ff1f73ee8..b622e6c30 100644
--- a/src/gui/lcd4l_setup.cpp
+++ b/src/gui/lcd4l_setup.cpp
@@ -37,13 +37,13 @@
 
 #include <global.h>
 #include <neutrino.h>
-#include <mymenu.h>
 #include <neutrino_menue.h>
 
 #include <gui/filebrowser.h>
 #include <gui/widget/hintbox.h>
 #include <gui/widget/icons.h>
 #include <gui/widget/menue.h>
+#include <gui/widget/menue_options.h>
 
 #include <gui/lcd4l_setup.h>
 
diff --git a/src/gui/mediaplayer_setup.cpp b/src/gui/mediaplayer_setup.cpp
index 214d17e1a..3d397e622 100644
--- a/src/gui/mediaplayer_setup.cpp
+++ b/src/gui/mediaplayer_setup.cpp
@@ -38,9 +38,9 @@
 
 #include <global.h>
 #include <neutrino.h>
-#include <mymenu.h>
 
 #include <gui/widget/icons.h>
+#include <gui/widget/menue_options.h>
 #include <gui/widget/stringinput.h>
 
 #include <gui/audioplayer_setup.h>
diff --git a/src/gui/miscsettings_menu.cpp b/src/gui/miscsettings_menu.cpp
index 338fcb1f3..48f20b49d 100644
--- a/src/gui/miscsettings_menu.cpp
+++ b/src/gui/miscsettings_menu.cpp
@@ -28,7 +28,6 @@
 
 #include <global.h>
 #include <neutrino.h>
-#include <mymenu.h>
 #include <neutrino_menue.h>
 #include <system/setting_helpers.h>
 #include <system/helpers.h>
@@ -48,6 +47,7 @@
 #include <gui/zapit_setup.h>
 
 #include <gui/widget/icons.h>
+#include <gui/widget/menue_options.h>
 #include <gui/widget/stringinput.h>
 #include <gui/widget/msgbox.h>
 #include <gui/widget/keyboard_input.h>
diff --git a/src/gui/moviebrowser/mb.cpp b/src/gui/moviebrowser/mb.cpp
index 1b32021b6..eddd2cab9 100644
--- a/src/gui/moviebrowser/mb.cpp
+++ b/src/gui/moviebrowser/mb.cpp
@@ -56,6 +56,7 @@
 #include <gui/epgview.h>
 #include <gui/widget/hintbox.h>
 #include <gui/widget/icons.h>
+#include <gui/widget/menue_options.h>
 #include <gui/components/cc.h>
 #include <gui/widget/msgbox.h>
 #include <gui/widget/stringinput.h>
@@ -63,7 +64,6 @@
 #include <sys/stat.h>
 #include <gui/nfs.h>
 #include <neutrino.h>
-#include <mymenu.h>
 #include <sys/vfs.h> // for statfs
 #include <sys/mount.h>
 #include <utime.h>
diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp
index fbd6c1bcb..abd18d89b 100644
--- a/src/gui/movieplayer.cpp
+++ b/src/gui/movieplayer.cpp
@@ -51,6 +51,7 @@
 #include <gui/lua/luainstance.h>
 #include <gui/lua/lua_video.h>
 #include <gui/screensaver.h>
+#include <gui/widget/menue_options.h>
 #include <driver/screenshot.h>
 #include <driver/volume.h>
 #include <driver/display.h>
@@ -61,8 +62,6 @@
 #include <system/helpers.h>
 #include <system/helpers-json.h>
 
-#include <src/mymenu.h>
-
 #include <unistd.h>
 #include <stdlib.h>
 #include <sys/timeb.h>
diff --git a/src/gui/network_service.cpp b/src/gui/network_service.cpp
index 64b288eec..241911bc4 100644
--- a/src/gui/network_service.cpp
+++ b/src/gui/network_service.cpp
@@ -29,8 +29,8 @@
 #include <neutrino.h>
 
 #include <gui/widget/icons.h>
+#include <gui/widget/menue_options.h>
 #include "network_service.h"
-#include <mymenu.h>
 
 #include <driver/screen_max.h>
 
diff --git a/src/gui/network_setup.cpp b/src/gui/network_setup.cpp
index 69dafa27a..d29cf517a 100644
--- a/src/gui/network_setup.cpp
+++ b/src/gui/network_setup.cpp
@@ -39,6 +39,7 @@
 #include <gui/nfs.h>
 
 #include <gui/widget/icons.h>
+#include <gui/widget/menue_options.h>
 #include <gui/widget/stringinput.h>
 #include <gui/widget/stringinput_ext.h>
 #include <gui/widget/keyboard_input.h>
@@ -53,7 +54,6 @@
 
 #include <global.h>
 #include <neutrino.h>
-#include <mymenu.h>
 #include <neutrino_menue.h>
 
 #include <driver/screen_max.h>
diff --git a/src/gui/osd_progressbar_setup.cpp b/src/gui/osd_progressbar_setup.cpp
index 24f6889df..3dea5785a 100644
--- a/src/gui/osd_progressbar_setup.cpp
+++ b/src/gui/osd_progressbar_setup.cpp
@@ -32,9 +32,9 @@
 
 #include <global.h>
 #include <neutrino.h>
-#include <mymenu.h>
 #include <neutrino_menue.h>
 
+#include <gui/widget/menue_options.h>
 #include <driver/screen_max.h>
 
 #include <system/debug.h>
diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp
index d50aa0823..3e4b7abc6 100644
--- a/src/gui/osd_setup.cpp
+++ b/src/gui/osd_setup.cpp
@@ -36,7 +36,6 @@
 
 #include <global.h>
 #include <neutrino.h>
-#include <mymenu.h>
 #include <neutrino_menue.h>
 
 #include "osd_setup.h"
@@ -53,6 +52,7 @@
 #include <gui/infoclock.h>
 #include <gui/timeosd.h>
 #include <gui/widget/icons.h>
+#include <gui/widget/menue_options.h>
 #include <gui/widget/colorchooser.h>
 #include <gui/widget/stringinput.h>
 #include <gui/radiotext_window.h>
diff --git a/src/gui/osdlang_setup.cpp b/src/gui/osdlang_setup.cpp
index 43b8cdf6f..b18765223 100644
--- a/src/gui/osdlang_setup.cpp
+++ b/src/gui/osdlang_setup.cpp
@@ -39,10 +39,10 @@
 
 #include <global.h>
 #include <neutrino.h>
-#include <mymenu.h>
 #include <neutrino_menue.h>
 
 #include <gui/widget/icons.h>
+#include <gui/widget/menue_options.h>
 
 #include <driver/screen_max.h>
 
diff --git a/src/gui/personalize.cpp b/src/gui/personalize.cpp
index 150c74d68..f339fbb93 100644
--- a/src/gui/personalize.cpp
+++ b/src/gui/personalize.cpp
@@ -158,7 +158,6 @@
 #include <global.h>
 #include <neutrino.h>
 #include <neutrino_menue.h>
-#include <mymenu.h>
 #include <sigc++/bind.h>
 #include <stdio.h>
 #include <sstream>
@@ -171,6 +170,7 @@
 #include <driver/rcinput.h>
 #include <driver/screen_max.h>
 #include <daemonc/remotecontrol.h>
+#include <gui/widget/menue_options.h>
 #include <gui/widget/helpbox.h>
 #include "widget/msgbox.h"
 #include "widget/hintbox.h"
diff --git a/src/gui/quadpip_setup.cpp b/src/gui/quadpip_setup.cpp
index ba51ecbbf..64d86ff46 100644
--- a/src/gui/quadpip_setup.cpp
+++ b/src/gui/quadpip_setup.cpp
@@ -29,10 +29,11 @@
 #include "quadpip_setup.h"
 
 #include <global.h>
-#include <mymenu.h>
 #include <neutrino.h>
 #include <neutrino_menue.h>
 
+#include <gui/widget/menue_options.h>
+
 #include <driver/fontrenderer.h>
 #include <driver/screen_max.h>
 
diff --git a/src/gui/record_setup.cpp b/src/gui/record_setup.cpp
index 9257335bf..64133718e 100644
--- a/src/gui/record_setup.cpp
+++ b/src/gui/record_setup.cpp
@@ -37,13 +37,13 @@
 #include <global.h>
 #include <neutrino.h>
 #include <neutrino_menue.h>
-#include <mymenu.h>
 
 #include "record_setup.h"
 #include <gui/filebrowser.h>
 #include <gui/followscreenings.h>
 
 #include <gui/widget/icons.h>
+#include <gui/widget/menue_options.h>
 #include <gui/widget/msgbox.h>
 #include <gui/widget/stringinput.h>
 #include <gui/widget/stringinput_ext.h>
diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp
index d116396be..4ccc026be 100644
--- a/src/gui/scan_setup.cpp
+++ b/src/gui/scan_setup.cpp
@@ -38,7 +38,6 @@
 
 #include <global.h>
 #include <neutrino.h>
-#include <mymenu.h>
 #include <neutrino_menue.h>
 
 #include <gui/scan.h>
@@ -47,6 +46,7 @@
 #include <gui/bedit/bouqueteditor_bouquets.h>
 
 #include <gui/widget/hintbox.h>
+#include <gui/widget/menue_options.h>
 #include <gui/widget/stringinput.h>
 
 #include <driver/screen_max.h>
diff --git a/src/gui/subchannel_select.cpp b/src/gui/subchannel_select.cpp
index 5bdb0dd5c..5786a57ef 100644
--- a/src/gui/subchannel_select.cpp
+++ b/src/gui/subchannel_select.cpp
@@ -35,9 +35,10 @@
 
 #include <global.h>
 #include <neutrino.h>
-#include <mymenu.h>
 
 #include "subchannel_select.h"
+
+#include <gui/widget/menue_options.h>
 #include <driver/record.h>
 
 extern CRemoteControl *g_RemoteControl;
diff --git a/src/gui/update.cpp b/src/gui/update.cpp
index 27d5ab7ce..1dff60fda 100644
--- a/src/gui/update.cpp
+++ b/src/gui/update.cpp
@@ -40,7 +40,6 @@
 #include <global.h>
 #include <neutrino.h>
 #include <neutrino_menue.h>
-#include <mymenu.h>
 
 #include <driver/display.h>
 #include <driver/fontrenderer.h>
@@ -52,6 +51,7 @@
 #if ENABLE_PKG_MANAGEMENT
 #include <gui/opkg_manager.h>
 #endif
+#include <gui/widget/menue_options.h>
 #include <gui/widget/msgbox.h>
 #include <gui/widget/hintbox.h>
 
diff --git a/src/gui/update_settings.cpp b/src/gui/update_settings.cpp
index 6838f8477..0a2c482da 100644
--- a/src/gui/update_settings.cpp
+++ b/src/gui/update_settings.cpp
@@ -35,7 +35,6 @@
 
 #include <global.h>
 #include <neutrino.h>
-#include <mymenu.h>
 #include <neutrino_menue.h>
 #include <gui/filebrowser.h>
 #include <gui/update_check.h>
@@ -46,6 +45,7 @@
 #include <gui/update_ext.h>
 #include <gui/update_settings.h>
 #include <gui/widget/icons.h>
+#include <gui/widget/menue_options.h>
 #include <driver/screen_max.h>
 #include <system/debug.h>
 #include <system/helpers.h>
diff --git a/src/gui/user_menue.cpp b/src/gui/user_menue.cpp
index 861886fbd..9e1cb7861 100644
--- a/src/gui/user_menue.cpp
+++ b/src/gui/user_menue.cpp
@@ -69,9 +69,9 @@
 
 #include <global.h>
 #include <neutrino.h>
-#include <mymenu.h>
 
 #include <gui/widget/icons.h>
+#include <gui/widget/menue_options.h>
 #include <gui/adzap.h>
 #include <gui/network_setup.h>
 #ifdef ENABLE_LCD4LINUX
diff --git a/src/gui/vfd_setup.cpp b/src/gui/vfd_setup.cpp
index d5766b50b..eca5bff1b 100644
--- a/src/gui/vfd_setup.cpp
+++ b/src/gui/vfd_setup.cpp
@@ -37,10 +37,10 @@
 
 #include <global.h>
 #include <neutrino.h>
-#include <mymenu.h>
 #include <neutrino_menue.h>
 
 #include <gui/widget/icons.h>
+#include <gui/widget/menue_options.h>
 
 #ifdef ENABLE_GRAPHLCD
 #include <gui/glcdsetup.h>
diff --git a/src/gui/videosettings.cpp b/src/gui/videosettings.cpp
index 1669d1876..113e0347a 100644
--- a/src/gui/videosettings.cpp
+++ b/src/gui/videosettings.cpp
@@ -39,9 +39,9 @@
 
 #include <global.h>
 #include <neutrino.h>
-#include <mymenu.h>
 
 #include <gui/widget/icons.h>
+#include <gui/widget/menue_options.h>
 #include <gui/widget/stringinput.h>
 #include <gui/widget/hintbox.h>
 #include <gui/widget/msgbox.h>
diff --git a/src/gui/webchannels_setup.cpp b/src/gui/webchannels_setup.cpp
index 67b7cd149..56dd32f34 100644
--- a/src/gui/webchannels_setup.cpp
+++ b/src/gui/webchannels_setup.cpp
@@ -32,13 +32,13 @@
 #include <gui/movieplayer.h>
 #include <gui/widget/hintbox.h>
 #include <gui/widget/keyboard_input.h>
+#include <gui/widget/menue_options.h>
 #include <zapit/zapit.h>
 #include <neutrino_menue.h>
 #include "webchannels_setup.h"
 
 
 #include <dirent.h>
-#include <mymenu.h>
 #include <system/helpers.h>
 
 const CMenuOptionChooser::keyval_ext LIVESTREAM_RESOLUTION_OPTIONS[] =
diff --git a/src/mymenu.h b/src/gui/widget/menue_options.h
similarity index 63%
rename from src/mymenu.h
rename to src/gui/widget/menue_options.h
index 40aa3db36..e780e8da3 100644
--- a/src/mymenu.h
+++ b/src/gui/widget/menue_options.h
@@ -2,19 +2,26 @@
 const CMenuOptionChooser::keyval OPTIONS_OFF0_ON1_OPTIONS[OPTIONS_OFF0_ON1_OPTION_COUNT] =
 {
 	{ 0, LOCALE_OPTIONS_OFF },
-	{ 1, LOCALE_OPTIONS_ON  }
+	{ 1, LOCALE_OPTIONS_ON }
 };
 
 #define OPTIONS_OFF1_ON0_OPTION_COUNT 2
 const CMenuOptionChooser::keyval OPTIONS_OFF1_ON0_OPTIONS[OPTIONS_OFF1_ON0_OPTION_COUNT] =
 {
 	{ 1, LOCALE_OPTIONS_OFF },
-	{ 0, LOCALE_OPTIONS_ON  }
+	{ 0, LOCALE_OPTIONS_ON }
 };
 
 #define MESSAGEBOX_NO_YES_OPTION_COUNT 2
 const CMenuOptionChooser::keyval MESSAGEBOX_NO_YES_OPTIONS[MESSAGEBOX_NO_YES_OPTION_COUNT] =
 {
-	{ 0, LOCALE_MESSAGEBOX_NO  },
+	{ 0, LOCALE_MESSAGEBOX_NO },
 	{ 1, LOCALE_MESSAGEBOX_YES }
 };
+
+#define OPTIONS_START0_STOP1_OPTION_COUNT 2
+const CMenuOptionChooser::keyval OPTIONS_START0_STOP1_OPTIONS[OPTIONS_START0_STOP1_OPTION_COUNT] =
+{
+	{ 0, LOCALE_OPTIONS_START },
+	{ 1, LOCALE_OPTIONS_STOP }
+};
diff --git a/src/gui/zapit_setup.cpp b/src/gui/zapit_setup.cpp
index 1699242a3..1def3b37d 100644
--- a/src/gui/zapit_setup.cpp
+++ b/src/gui/zapit_setup.cpp
@@ -32,10 +32,10 @@
 
 #include <global.h>
 #include <neutrino.h>
-#include <mymenu.h>
 #include <neutrino_menue.h>
 
 #include <driver/screen_max.h>
+#include <gui/widget/menue_options.h>
 
 CZapitSetup::CZapitSetup()
 {
diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp
index 0d0676509..7d2bc2aa8 100644
--- a/src/neutrino_menue.cpp
+++ b/src/neutrino_menue.cpp
@@ -30,7 +30,6 @@
 
 #include "global.h"
 #include "neutrino.h"
-#include "mymenu.h"
 
 #include <system/debug.h>
 
@@ -75,6 +74,7 @@
 #include "gui/update.h"
 #include "gui/vfd_setup.h"
 #include "gui/videosettings.h"
+#include "gui/widget/menue_options.h"
 #include "driver/record.h"
 #include "driver/display.h"