diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale
index f3bef00cc..c4555b354 100644
--- a/data/locale/deutsch.locale
+++ b/data/locale/deutsch.locale
@@ -1579,7 +1579,8 @@ moviebrowser.delete_all Alle markierten Filme ohne weitere Nachfrage löschen?
 moviebrowser.delete_info Lösche Dateien, bitte warten...
 moviebrowser.delete_screenshot Lösche Screenshot?
 moviebrowser.dir Pfad
-moviebrowser.dir_head Zusätzliche Verzeichnisse
+moviebrowser.directories Verzeichnisse
+moviebrowser.directories_additional Zusätzliche Verzeichnisse
 moviebrowser.edit_book Bookmark Ändern
 moviebrowser.edit_book_name_info1 Neuer Markierungsname
 moviebrowser.edit_book_name_info2 Markierungsname info2
@@ -1599,15 +1600,25 @@ moviebrowser.head Meine Aufnahmen
 moviebrowser.head_filter Filme nach Kategorie filtern:
 moviebrowser.head_playlist Zuletzt gesehen:
 moviebrowser.head_recordlist Zuletzt aufgenommen:
+moviebrowser.help_button_blue Filminfos neu laden
+moviebrowser.help_button_green Filterfenster einblenden
+moviebrowser.help_button_left Ansicht ändern
+moviebrowser.help_button_menu Hauptmenü öffnen
+moviebrowser.help_button_mute Filme löschen
+moviebrowser.help_button_okay Filme abspielen
+moviebrowser.help_button_play Filme markieren
+moviebrowser.help_button_red Sortierung ändern
+moviebrowser.help_button_right Ansicht ändern
+moviebrowser.help_button_yellow Aktives Fenster wechseln
 moviebrowser.hide_series Verstecke Serien
 moviebrowser.hint_copy_onefile 
 moviebrowser.hint_copy_several 
 moviebrowser.hint_cut 
-moviebrowser.hint_jumpbackward Rücksprung in 5 s\n '0' zum Weitersehen
-moviebrowser.hint_jumpforward Werbung überspringen in 5 s\n '0' zum Ansehen
-moviebrowser.hint_movieend Filmende in 5 s\n '0' zum Weitersehen
-moviebrowser.hint_newbook_backward Neue Wiederholung\n 'blue' für Endposition
-moviebrowser.hint_newbook_forward Neuer Werbesprung\n 'blue' für Endposition
+moviebrowser.hint_jumpbackward Rücksprung in 5 Sekunden\n'0' zum Weitersehen
+moviebrowser.hint_jumpforward Werbung überspringen in 5 Sekunden\n'0' zum Ansehen
+moviebrowser.hint_movieend Filmende in 5 Sekunden\n'0' zum Weitersehen
+moviebrowser.hint_newbook_backward Neue Wiederholung gestartet.\n'%s' bestimmt die Endposition, '0' bricht ab.
+moviebrowser.hint_newbook_forward Neuer Werbesprung gestartet.\n'%s' bestimmt die Endposition, '0' bricht ab.
 moviebrowser.hint_truncate 
 moviebrowser.info_audio Audio
 moviebrowser.info_channel Kanal
@@ -1644,7 +1655,7 @@ moviebrowser.menu_copy_onefile Film kopieren
 moviebrowser.menu_copy_several Film kopieren und teilen
 moviebrowser.menu_cut Film schneiden
 moviebrowser.menu_cut_head Kopieren, Schneiden und Kürzen
-moviebrowser.menu_directories_head Verzeichnisse/Freier Speicher
+moviebrowser.menu_directories_head Verzeichnisse de/aktivieren
 moviebrowser.menu_help_head Hilfe
 moviebrowser.menu_main_bookmarks Markierungen
 moviebrowser.menu_main_head Einstellungen
diff --git a/data/locale/english.locale b/data/locale/english.locale
index 9c01a60f5..875b688a1 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -1581,7 +1581,8 @@ moviebrowser.delete_all Delete all selected movies without any questions?
 moviebrowser.delete_info Delete files, please wait...
 moviebrowser.delete_screenshot Delete screenshot?
 moviebrowser.dir Path
-moviebrowser.dir_head Additional paths
+moviebrowser.directories Directories
+moviebrowser.directories_additional Additional directories
 moviebrowser.edit_book Bookmark change
 moviebrowser.edit_book_name_info1 Enter new Bookmark name
 moviebrowser.edit_book_name_info2 book name info2
@@ -1601,15 +1602,25 @@ moviebrowser.head My recordings
 moviebrowser.head_filter Filter movies by category:
 moviebrowser.head_playlist Last played:
 moviebrowser.head_recordlist Last recorded:
+moviebrowser.help_button_blue Reload movie informations
+moviebrowser.help_button_green Show filter selection
+moviebrowser.help_button_left Change view
+moviebrowser.help_button_menu Open main menu
+moviebrowser.help_button_mute Delete movies
+moviebrowser.help_button_okay Play movies
+moviebrowser.help_button_play Mark movies
+moviebrowser.help_button_red Change sort
+moviebrowser.help_button_right Change view
+moviebrowser.help_button_yellow Switch active window
 moviebrowser.hide_series Hide series
 moviebrowser.hint_copy_onefile 
 moviebrowser.hint_copy_several 
 moviebrowser.hint_cut 
-moviebrowser.hint_jumpbackward Jump back in 5 s\n '0' to cancel
-moviebrowser.hint_jumpforward Jump forward in 5 s\n '0' to cancel
-moviebrowser.hint_movieend Film end in 5 s\n '0' to cancel
-moviebrowser.hint_newbook_backward New jump back\n 'blue' for endposition
-moviebrowser.hint_newbook_forward New jump forward\n 'blue' for endposition
+moviebrowser.hint_jumpbackward Jump back in 5 seconds\n'0' to cancel
+moviebrowser.hint_jumpforward Jump forward in 5 seconds\n'0' to cancel
+moviebrowser.hint_movieend Film end in 5 seconds\n'0' to cancel
+moviebrowser.hint_newbook_backward New jump back started\n'%s' to define endposition, '0' to cancel
+moviebrowser.hint_newbook_forward New jump forward started\n'%s' to define endposition, '0' to cancel
 moviebrowser.hint_truncate 
 moviebrowser.info_audio Audio
 moviebrowser.info_channel Channel
@@ -1646,7 +1657,7 @@ moviebrowser.menu_copy_onefile Copy movie
 moviebrowser.menu_copy_several Copy and split movie
 moviebrowser.menu_cut Cut movie
 moviebrowser.menu_cut_head Copy, cut and truncate
-moviebrowser.menu_directories_head Paths
+moviebrowser.menu_directories_head Directories de/activate
 moviebrowser.menu_help_head Help
 moviebrowser.menu_main_bookmarks Bookmarks
 moviebrowser.menu_main_head Settings
diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp
index 6602b9651..442a5cd3b 100644
--- a/src/gui/channellist.cpp
+++ b/src/gui/channellist.cpp
@@ -1856,6 +1856,9 @@ void CChannelList::paintItem(int pos, const bool firstpaint)
 			iscurrent = SameTP((*chanlist)[curr]);
 	}
 
+	if(selected >= (*chanlist).size())
+		selected = (*chanlist).size()-1;
+
 	if (curr == selected) {
 		color   = COL_MENUCONTENTSELECTED_TEXT;
 		bgcolor = COL_MENUCONTENTSELECTED_PLUS_0;
diff --git a/src/gui/epgplus.cpp b/src/gui/epgplus.cpp
index 4a0dafae4..a65234f23 100644
--- a/src/gui/epgplus.cpp
+++ b/src/gui/epgplus.cpp
@@ -465,7 +465,7 @@ void EpgPlus::Footer::paintEventDetails (const std::string & description, const
 	int height = this->fontBouquetChannelName->getHeight();
 
 	// clear the region
-	this->frameBuffer->paintBoxRel (this->x, yPos, this->width, height, COL_MENUHEAD_PLUS_0);
+	this->frameBuffer->paintBoxRel (this->x, yPos, this->width, height, COL_MENUCONTENT_PLUS_0);
 
 	yPos += height;
 
@@ -475,7 +475,7 @@ void EpgPlus::Footer::paintEventDetails (const std::string & description, const
 	height = this->fontEventDescription->getHeight();
 
 	// clear the region
-	this->frameBuffer->paintBoxRel (this->x, yPos, this->width, height, COL_MENUHEAD_PLUS_0);
+	this->frameBuffer->paintBoxRel (this->x, yPos, this->width, height, COL_MENUCONTENT_PLUS_0);
 
 	yPos += height;
 
@@ -485,7 +485,7 @@ void EpgPlus::Footer::paintEventDetails (const std::string & description, const
 	height = this->fontEventShortDescription->getHeight();
 
 	// clear the region
-	this->frameBuffer->paintBoxRel (this->x, yPos, this->width, height, COL_MENUHEAD_PLUS_0);
+	this->frameBuffer->paintBoxRel (this->x, yPos, this->width, height, COL_MENUCONTENT_PLUS_0);
 
 	yPos += height;
 
diff --git a/src/gui/lua/lua_misc.cpp b/src/gui/lua/lua_misc.cpp
index b82e49205..eb26b19c9 100644
--- a/src/gui/lua/lua_misc.cpp
+++ b/src/gui/lua/lua_misc.cpp
@@ -60,6 +60,7 @@ void CLuaInstMisc::LuaMiscRegister(lua_State *L)
 		{ "runScript",       CLuaInstMisc::runScriptExt },
 		{ "GetRevision",     CLuaInstMisc::GetRevision },
 		{ "checkVersion",    CLuaInstMisc::checkVersion },
+		{ "postMsg",         CLuaInstMisc::postMsg },
 		{ "__gc",            CLuaInstMisc::MiscDelete },
 		{ NULL, NULL }
 	};
@@ -201,6 +202,22 @@ int CLuaInstMisc::checkVersion(lua_State *L)
 	return 1;
 }
 
+int CLuaInstMisc::postMsg(lua_State *L)
+{
+	lua_Integer msg = 0;
+	neutrino_msg_t post_msg = 0;
+	msg = luaL_checkint(L, 2);
+	switch (msg) {
+		case POSTMSG_STANDBY_ON:
+			post_msg = NeutrinoMessages::STANDBY_ON;
+			break;
+		default:
+			return 0;
+	}
+	g_RCInput->postMsg(post_msg, 0);
+	return 0;
+}
+
 int CLuaInstMisc::MiscDelete(lua_State *L)
 {
 	CLuaMisc *D = MiscCheckData(L, 1);
diff --git a/src/gui/lua/lua_misc.h b/src/gui/lua/lua_misc.h
index 3c6d7b55c..551c40443 100644
--- a/src/gui/lua/lua_misc.h
+++ b/src/gui/lua/lua_misc.h
@@ -31,6 +31,10 @@ class CLuaMisc
 class CLuaInstMisc
 {
 	public:
+		enum {
+			POSTMSG_STANDBY_ON = 1
+		};
+
 		CLuaInstMisc() {};
 		~CLuaInstMisc() {};
 		static CLuaInstMisc* getInstance();
@@ -53,6 +57,7 @@ class CLuaInstMisc
 		static int runScriptExt(lua_State *L);
 		static int GetRevision(lua_State *L);
 		static int checkVersion(lua_State *L);
+		static int postMsg(lua_State *L);
 		static int MiscDelete(lua_State *L);
 
 		static void miscFunctionDeprecated(lua_State *L, std::string oldFunc);
diff --git a/src/gui/lua/luainstance.cpp b/src/gui/lua/luainstance.cpp
index 7cd56e294..f70fe2d07 100644
--- a/src/gui/lua/luainstance.cpp
+++ b/src/gui/lua/luainstance.cpp
@@ -338,6 +338,12 @@ static void set_lua_variables(lua_State *L)
 		{ NULL, 0 }
 	};
 
+	table_key post_msg[] =
+	{
+		{ "STANDBY_ON",		(lua_Integer)CLuaInstMisc::POSTMSG_STANDBY_ON },
+		{ NULL, 0 }
+	};
+
 	/* list of environment variable arrays to be exported */
 	lua_envexport e[] =
 	{
@@ -352,6 +358,7 @@ static void set_lua_variables(lua_State *L)
 		{ "DYNFONT",     dynfont },
 		{ "CURL",        curl_status },
 		{ "NMODE",       neutrino_mode },
+		{ "POSTMSG",     post_msg },
 		{ NULL, NULL }
 	};
 
diff --git a/src/gui/lua/luainstance.h b/src/gui/lua/luainstance.h
index fe3654c0b..75ff2094a 100644
--- a/src/gui/lua/luainstance.h
+++ b/src/gui/lua/luainstance.h
@@ -32,7 +32,7 @@ extern "C" {
 
 #if 0
 #define LUA_API_VERSION_MAJOR 1
-#define LUA_API_VERSION_MINOR 32
+#define LUA_API_VERSION_MINOR 33
 #endif
 
 /* inspired by Steve Kemp http://www.steve.org.uk/ */
diff --git a/src/gui/moviebrowser.cpp b/src/gui/moviebrowser.cpp
index 9741c4dd7..763b4b664 100644
--- a/src/gui/moviebrowser.cpp
+++ b/src/gui/moviebrowser.cpp
@@ -3006,7 +3006,7 @@ bool CMovieBrowser::showMenu(bool calledExternally)
 
 	optionsMenuDir.addItem(new CMenuOptionChooser(LOCALE_MOVIEBROWSER_USE_MOVIE_DIR,     (int*)(&m_settings.storageDirMovieUsed), MESSAGEBOX_YES_NO_OPTIONS, MESSAGEBOX_YES_NO_OPTIONS_COUNT, true));
 	optionsMenuDir.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_DIR, false, g_settings.network_nfs_moviedir));
-	optionsMenuDir.addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_MOVIEBROWSER_DIR_HEAD));
+	optionsMenuDir.addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_MOVIEBROWSER_DIRECTORIES_ADDITIONAL));
 
 	COnOffNotifier* notifier[MB_MAX_DIRS];
 	for (i = 0; i < MB_MAX_DIRS ; i++)
@@ -3054,13 +3054,13 @@ bool CMovieBrowser::showMenu(bool calledExternally)
 	CMenuWidget optionsMenu(LOCALE_MOVIEBROWSER_HEAD, NEUTRINO_ICON_MOVIEPLAYER);
 
 	optionsMenu.addIntroItems(LOCALE_EPGPLUS_OPTIONS);
-	optionsMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_LOAD_DEFAULT, true, NULL, this, "loaddefault",              CRCInput::RC_blue));
+	optionsMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_LOAD_DEFAULT, true, NULL, this, "loaddefault",              CRCInput::RC_red));
 	optionsMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_OPTION_BROWSER, true, NULL, &optionsMenuBrowser,NULL,       CRCInput::RC_green));
-	optionsMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_MENU_DIRECTORIES_HEAD, true, NULL, &optionsMenuDir,NULL,    CRCInput::RC_yellow));
+	optionsMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_DIRECTORIES, true, NULL, &optionsMenuDir,NULL,    CRCInput::RC_yellow));
 	if (m_parentalLock != MB_PARENTAL_LOCK_OFF)
-		optionsMenu.addItem(new CLockedMenuForwarder(LOCALE_MOVIEBROWSER_MENU_PARENTAL_LOCK_HEAD, g_settings.parentallock_pincode, true,  true, NULL, &parentalMenu,NULL,CRCInput::RC_red));
+		optionsMenu.addItem(new CLockedMenuForwarder(LOCALE_MOVIEBROWSER_MENU_PARENTAL_LOCK_HEAD, g_settings.parentallock_pincode, true,  true, NULL, &parentalMenu,NULL,CRCInput::RC_blue));
 	else
-		optionsMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_MENU_PARENTAL_LOCK_HEAD,   true, NULL, &parentalMenu,NULL,CRCInput::RC_red));
+		optionsMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_MENU_PARENTAL_LOCK_HEAD,   true, NULL, &parentalMenu,NULL,CRCInput::RC_blue));
 	optionsMenu.addItem(GenericMenuSeparatorLine);
 	optionsMenu.addItem(new CMenuOptionChooser(LOCALE_MOVIEBROWSER_RELOAD_AT_START,   (int*)(&m_settings.reload), MESSAGEBOX_YES_NO_OPTIONS, MESSAGEBOX_YES_NO_OPTIONS_COUNT, true));
 	optionsMenu.addItem(new CMenuOptionChooser(LOCALE_MOVIEBROWSER_REMOUNT_AT_START,  (int*)(&m_settings.remount), MESSAGEBOX_YES_NO_OPTIONS, MESSAGEBOX_YES_NO_OPTIONS_COUNT, true));
@@ -3887,19 +3887,18 @@ int CMenuSelector::paint(bool selected)
 int CMovieHelp::exec(CMenuTarget* /*parent*/, const std::string & /*actionKey*/)
 {
 	Helpbox helpbox;
-	helpbox.addLine(NEUTRINO_ICON_BUTTON_RED, "Sortierung ändern");
-	helpbox.addLine(NEUTRINO_ICON_BUTTON_GREEN, "Filterfenster einblenden");
-	helpbox.addLine(NEUTRINO_ICON_BUTTON_YELLOW, "Aktives Fenster wechseln");
-	helpbox.addLine(NEUTRINO_ICON_BUTTON_BLUE, "Filminfos neu laden");
-	helpbox.addLine(NEUTRINO_ICON_BUTTON_MENU, "Hauptmenü");
-	helpbox.addLine("+/-  Ansicht wechseln");
+	helpbox.addLine(NEUTRINO_ICON_BUTTON_RED,	g_Locale->getText(LOCALE_MOVIEBROWSER_HELP_BUTTON_RED));
+	helpbox.addLine(NEUTRINO_ICON_BUTTON_GREEN,	g_Locale->getText(LOCALE_MOVIEBROWSER_HELP_BUTTON_GREEN));
+	helpbox.addLine(NEUTRINO_ICON_BUTTON_YELLOW,	g_Locale->getText(LOCALE_MOVIEBROWSER_HELP_BUTTON_YELLOW));
+	helpbox.addLine(NEUTRINO_ICON_BUTTON_BLUE,	g_Locale->getText(LOCALE_MOVIEBROWSER_HELP_BUTTON_BLUE));
+	helpbox.addLine(NEUTRINO_ICON_BUTTON_MENU_SMALL,g_Locale->getText(LOCALE_MOVIEBROWSER_HELP_BUTTON_MENU));
+	helpbox.addLine(NEUTRINO_ICON_BUTTON_PLAY,	g_Locale->getText(LOCALE_MOVIEBROWSER_HELP_BUTTON_PLAY));
 	helpbox.addLine("");
-	helpbox.addLine("Während der Filmwiedergabe:");
-	helpbox.addLine(NEUTRINO_ICON_BUTTON_BLUE, " Markierungsmenu ");
-	helpbox.addLine(NEUTRINO_ICON_BUTTON_0,    " Markierungsaktion nicht ausführen");
+	helpbox.addLine(NEUTRINO_ICON_BUTTON_OKAY,	g_Locale->getText(LOCALE_MOVIEBROWSER_HELP_BUTTON_OKAY));
+	helpbox.addLine(NEUTRINO_ICON_BUTTON_MUTE_SMALL,g_Locale->getText(LOCALE_MOVIEBROWSER_HELP_BUTTON_MUTE));
 	helpbox.addLine("");
-	helpbox.addLine("MovieBrowser $Revision: 1.10 $");
-	helpbox.addLine("by Günther");
+	helpbox.addLine(NEUTRINO_ICON_BUTTON_LEFT,	g_Locale->getText(LOCALE_MOVIEBROWSER_HELP_BUTTON_LEFT));
+	helpbox.addLine(NEUTRINO_ICON_BUTTON_RIGHT,	g_Locale->getText(LOCALE_MOVIEBROWSER_HELP_BUTTON_RIGHT));
 	helpbox.show(LOCALE_MESSAGEBOX_INFO);
 	return(0);
 }
diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp
index 897729fd6..551205bd5 100644
--- a/src/gui/movieplayer.cpp
+++ b/src/gui/movieplayer.cpp
@@ -1461,7 +1461,11 @@ void CMoviePlayerGui::handleMovieBrowser(neutrino_msg_t msg, int /*position*/)
 	static int jump_not_until = 0;	// any jump shall be avoided until this time (in seconds from moviestart)
 	static MI_BOOKMARK new_bookmark;	// used for new movie info bookmarks created from the movieplayer
 
-	static int width = 280;
+	std::string key_bookmark = CRCInput::getKeyName((neutrino_msg_t) g_settings.mpkey_bookmark);
+	char txt[1024];
+
+	//TODO: width and height could be more flexible
+	static int width = frameBuffer->getScreenWidth() / 2;
 	static int height = 65;
 
 	static int x = frameBuffer->getScreenX() + (frameBuffer->getScreenWidth() - width) / 2;
@@ -1472,8 +1476,12 @@ void CMoviePlayerGui::handleMovieBrowser(neutrino_msg_t msg, int /*position*/)
 	static CTextBox endHintBox(g_Locale->getText(LOCALE_MOVIEBROWSER_HINT_MOVIEEND), NULL, CTextBox::CENTER /*CTextBox::AUTO_WIDTH | CTextBox::AUTO_HIGH */ , &boxposition);
 	static CTextBox comHintBox(g_Locale->getText(LOCALE_MOVIEBROWSER_HINT_JUMPFORWARD), NULL, CTextBox::CENTER /*CTextBox::AUTO_WIDTH | CTextBox::AUTO_HIGH */ , &boxposition);
 	static CTextBox loopHintBox(g_Locale->getText(LOCALE_MOVIEBROWSER_HINT_JUMPBACKWARD), NULL, CTextBox::CENTER /*CTextBox::AUTO_WIDTH | CTextBox::AUTO_HIGH */ , &boxposition);
-	static CTextBox newLoopHintBox(g_Locale->getText(LOCALE_MOVIEBROWSER_HINT_NEWBOOK_BACKWARD), NULL, CTextBox::CENTER /*CTextBox::AUTO_WIDTH | CTextBox::AUTO_HIGH */ , &boxposition);
-	static CTextBox newComHintBox(g_Locale->getText(LOCALE_MOVIEBROWSER_HINT_NEWBOOK_FORWARD), NULL, CTextBox::CENTER /*CTextBox::AUTO_WIDTH | CTextBox::AUTO_HIGH */ , &boxposition);
+
+	snprintf(txt, sizeof(txt)-1, g_Locale->getText(LOCALE_MOVIEBROWSER_HINT_NEWBOOK_BACKWARD), key_bookmark.c_str());
+	static CTextBox newLoopHintBox(txt, NULL, CTextBox::CENTER /*CTextBox::AUTO_WIDTH | CTextBox::AUTO_HIGH */ , &boxposition);
+
+	snprintf(txt, sizeof(txt)-1, g_Locale->getText(LOCALE_MOVIEBROWSER_HINT_NEWBOOK_FORWARD), key_bookmark.c_str());
+	static CTextBox newComHintBox(txt, NULL, CTextBox::CENTER /*CTextBox::AUTO_WIDTH | CTextBox::AUTO_HIGH */ , &boxposition);
 
 	static bool showEndHintBox = false;	// flag to check whether the box shall be painted
 	static bool showComHintBox = false;	// flag to check whether the box shall be painted
@@ -1654,10 +1662,12 @@ void CMoviePlayerGui::handleMovieBrowser(neutrino_msg_t msg, int /*position*/)
 			bookStartMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_BOOK_LASTMOVIESTOP, isMovieBrowser, play_pos, &cSelectedMenuBookStart[1]));
 			bookStartMenu.addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_MOVIEBROWSER_BOOK_ADD));
 			bookStartMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_BOOK_NEW, isMovieBrowser, NULL, &cSelectedMenuBookStart[2]));
-			bookStartMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_BOOK_TYPE_FORWARD, isMovieBrowser, NULL, &cSelectedMenuBookStart[3]));
-			bookStartMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_BOOK_TYPE_BACKWARD, isMovieBrowser, NULL, &cSelectedMenuBookStart[4]));
-			bookStartMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_BOOK_MOVIESTART, isMovieBrowser, start_pos, &cSelectedMenuBookStart[5]));
-			bookStartMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_BOOK_MOVIEEND, isMovieBrowser, end_pos, &cSelectedMenuBookStart[6]));
+			bookStartMenu.addItem(new CMenuSeparator());
+			bookStartMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_BOOK_TYPE_FORWARD, isMovieBrowser, NULL, &cSelectedMenuBookStart[3], NULL, CRCInput::RC_red));
+			bookStartMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_BOOK_TYPE_BACKWARD, isMovieBrowser, NULL, &cSelectedMenuBookStart[4], NULL, CRCInput::RC_green));
+			bookStartMenu.addItem(new CMenuSeparator());
+			bookStartMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_BOOK_MOVIESTART, isMovieBrowser, start_pos, &cSelectedMenuBookStart[5], NULL, CRCInput::RC_yellow));
+			bookStartMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_BOOK_MOVIEEND, isMovieBrowser, end_pos, &cSelectedMenuBookStart[6], NULL, CRCInput::RC_blue));
 
 			// no, nothing else to do, we open a new bookmark menu
 			new_bookmark.name = "";	// use default name
diff --git a/src/gui/personalize.cpp b/src/gui/personalize.cpp
index 72cdf77ff..617fa1351 100644
--- a/src/gui/personalize.cpp
+++ b/src/gui/personalize.cpp
@@ -968,7 +968,7 @@ void CPersonalizeGui::addPersonalizedItems()
 				v_item[i].menuItem->hintIcon = fw->hintIcon;
 				v_item[i].menuItem->hint = fw->hint;
 				//add item if it's set to visible or pin protected and allow to add an forwarder as next
-				if (v_item[i].menuItem->active && (p_mode != PERSONALIZE_MODE_NOTVISIBLE || i_mode == PERSONALIZE_SHOW_AS_ACCESS_OPTION))
+				if (p_mode != PERSONALIZE_MODE_NOTVISIBLE || i_mode == PERSONALIZE_SHOW_AS_ACCESS_OPTION)
 				{
 					//add item
 					v_item[i].widget->addItem(v_item[i].menuItem, v_item[i].default_selected); //forwarders...
diff --git a/src/gui/streaminfo2.cpp b/src/gui/streaminfo2.cpp
index 03317fd54..969574759 100644
--- a/src/gui/streaminfo2.cpp
+++ b/src/gui/streaminfo2.cpp
@@ -660,7 +660,8 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
 		ypos += iheight;
 		sprintf (buf, "%s:",g_Locale->getText (LOCALE_TIMERLIST_CHANNEL));//swiped locale
 		g_Font[font_info]->RenderString(xpos, ypos, box_width, buf , COL_INFOBAR_TEXT);
-		sprintf(buf, "%s", channel->getName().c_str());
+			// process additional RealName if UserName exists >> uname.empty() ? realname : uname + realname
+		sprintf(buf, "%s", (channel->getName()==channel->getRealname()) ? channel->getRealname().c_str():(channel->getName()+" << "+channel->getRealname()).c_str());
 		g_Font[font_info]->RenderString (xpos+spaceoffset, ypos, box_width, buf, COL_INFOBAR_TEXT);
 
 		//tsfrequenz
@@ -719,7 +720,7 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
 			sprintf(buf, "%s", g_Locale->getText(LOCALE_STREAMINFO_NOT_AVAILABLE));
 		} else {
 			unsigned int sw=spaceoffset;
-			for (unsigned int li= 0; (li<g_RemoteControl->current_PIDs.APIDs.size()) && (li<10); li++)
+			for (unsigned int li= 0; (li<g_RemoteControl->current_PIDs.APIDs.size()) && (li<16); li++)
 			{
 				sprintf(buf, "0x%04X (%i)", g_RemoteControl->current_PIDs.APIDs[li].pid, g_RemoteControl->current_PIDs.APIDs[li].pid );
 				if (li == g_RemoteControl->current_PIDs.PIDs.selected_apid){
@@ -729,7 +730,7 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
 					g_Font[font_small]->RenderString(xpos+sw, ypos, box_width, buf, COL_INFOBAR_TEXT);
 				}
 				sw = g_Font[font_small]->getRenderWidth(buf)+sw+10;
-				if (((li+1)%3 == 0) &&(g_RemoteControl->current_PIDs.APIDs.size()-1 > li)){ // if we have lots of apids, put "intermediate" line with pids
+				if (((li+1)%4 == 0) &&(g_RemoteControl->current_PIDs.APIDs.size()-1 > li)){ // if we have lots of apids, put "intermediate" line with pids
 					ypos+= sheight;
 					sw=spaceoffset;
 				}
diff --git a/src/system/locals.h b/src/system/locals.h
index 8c1d22bbe..ed0b4642a 100644
--- a/src/system/locals.h
+++ b/src/system/locals.h
@@ -1608,7 +1608,8 @@ typedef enum
 	LOCALE_MOVIEBROWSER_DELETE_INFO,
 	LOCALE_MOVIEBROWSER_DELETE_SCREENSHOT,
 	LOCALE_MOVIEBROWSER_DIR,
-	LOCALE_MOVIEBROWSER_DIR_HEAD,
+	LOCALE_MOVIEBROWSER_DIRECTORIES,
+	LOCALE_MOVIEBROWSER_DIRECTORIES_ADDITIONAL,
 	LOCALE_MOVIEBROWSER_EDIT_BOOK,
 	LOCALE_MOVIEBROWSER_EDIT_BOOK_NAME_INFO1,
 	LOCALE_MOVIEBROWSER_EDIT_BOOK_NAME_INFO2,
@@ -1628,6 +1629,16 @@ typedef enum
 	LOCALE_MOVIEBROWSER_HEAD_FILTER,
 	LOCALE_MOVIEBROWSER_HEAD_PLAYLIST,
 	LOCALE_MOVIEBROWSER_HEAD_RECORDLIST,
+	LOCALE_MOVIEBROWSER_HELP_BUTTON_BLUE,
+	LOCALE_MOVIEBROWSER_HELP_BUTTON_GREEN,
+	LOCALE_MOVIEBROWSER_HELP_BUTTON_LEFT,
+	LOCALE_MOVIEBROWSER_HELP_BUTTON_MENU,
+	LOCALE_MOVIEBROWSER_HELP_BUTTON_MUTE,
+	LOCALE_MOVIEBROWSER_HELP_BUTTON_OKAY,
+	LOCALE_MOVIEBROWSER_HELP_BUTTON_PLAY,
+	LOCALE_MOVIEBROWSER_HELP_BUTTON_RED,
+	LOCALE_MOVIEBROWSER_HELP_BUTTON_RIGHT,
+	LOCALE_MOVIEBROWSER_HELP_BUTTON_YELLOW,
 	LOCALE_MOVIEBROWSER_HIDE_SERIES,
 	LOCALE_MOVIEBROWSER_HINT_COPY_ONEFILE,
 	LOCALE_MOVIEBROWSER_HINT_COPY_SEVERAL,
diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h
index 03d79eacf..3bd5b0347 100644
--- a/src/system/locals_intern.h
+++ b/src/system/locals_intern.h
@@ -1608,7 +1608,8 @@ const char * locale_real_names[] =
 	"moviebrowser.delete_info",
 	"moviebrowser.delete_screenshot",
 	"moviebrowser.dir",
-	"moviebrowser.dir_head",
+	"moviebrowser.directories",
+	"moviebrowser.directories_additional",
 	"moviebrowser.edit_book",
 	"moviebrowser.edit_book_name_info1",
 	"moviebrowser.edit_book_name_info2",
@@ -1628,6 +1629,16 @@ const char * locale_real_names[] =
 	"moviebrowser.head_filter",
 	"moviebrowser.head_playlist",
 	"moviebrowser.head_recordlist",
+	"moviebrowser.help_button_blue",
+	"moviebrowser.help_button_green",
+	"moviebrowser.help_button_left",
+	"moviebrowser.help_button_menu",
+	"moviebrowser.help_button_mute",
+	"moviebrowser.help_button_okay",
+	"moviebrowser.help_button_play",
+	"moviebrowser.help_button_red",
+	"moviebrowser.help_button_right",
+	"moviebrowser.help_button_yellow",
 	"moviebrowser.hide_series",
 	"moviebrowser.hint_copy_onefile",
 	"moviebrowser.hint_copy_several",