diff --git a/src/gui/bouquetlist.cpp b/src/gui/bouquetlist.cpp
index 00802de69..ebefac213 100644
--- a/src/gui/bouquetlist.cpp
+++ b/src/gui/bouquetlist.cpp
@@ -33,7 +33,6 @@
 #include <gui/color.h>
 #include <gui/eventlist.h>
 #include <gui/infoviewer.h>
-
 #include <gui/components/cc.h>
 #include <gui/widget/menue.h>
 #include <gui/widget/menue_options.h>
@@ -62,14 +61,14 @@
 
 extern CBouquetManager *g_bouquetManager;
 
-CBouquetList::CBouquetList(const char * const Name)
+CBouquetList::CBouquetList(const char *const Name)
 {
 	frameBuffer = CFrameBuffer::getInstance();
-	selected    = 0;
-	liststart   = 0;
-	favonly     = false;
+	selected = 0;
+	liststart = 0;
+	favonly = false;
 	save_bouquets = false;
-	if(Name == NULL)
+	if (Name == NULL)
 		name = g_Locale->getText(LOCALE_BOUQUETLIST_HEAD);
 	else
 		name = Name;
@@ -83,31 +82,33 @@ CBouquetList::~CBouquetList()
 	Bouquets.clear();
 }
 
-CBouquet* CBouquetList::addBouquet(CZapitBouquet * zapitBouquet)
+CBouquet *CBouquetList::addBouquet(CZapitBouquet *zapitBouquet)
 {
-	int BouquetKey= Bouquets.size();//FIXME not used ?
-	CBouquet* tmp = new CBouquet(BouquetKey, zapitBouquet->bName.c_str(), zapitBouquet->bLocked, !zapitBouquet->bUser);
+	int BouquetKey = Bouquets.size(); // FIXME not used ?
+	CBouquet *tmp = new CBouquet(BouquetKey, zapitBouquet->bName.c_str(), zapitBouquet->bLocked, !zapitBouquet->bUser);
 	tmp->zapitBouquet = zapitBouquet;
 	Bouquets.push_back(tmp);
 	return tmp;
 }
 
-CBouquet* CBouquetList::addBouquet(const char * const pname, int BouquetKey, bool locked)
+CBouquet *CBouquetList::addBouquet(const char *const pname, int BouquetKey, bool locked)
 {
-	if ( BouquetKey==-1 )
-		BouquetKey= Bouquets.size();
+	if (BouquetKey == -1)
+		BouquetKey = Bouquets.size();
 
-	CBouquet* tmp = new CBouquet( BouquetKey, pname, locked, true);
+	CBouquet *tmp = new CBouquet(BouquetKey, pname, locked, true);
 	Bouquets.push_back(tmp);
-	return(tmp);
+	return (tmp);
 }
 
-void CBouquetList::deleteBouquet(CBouquet*bouquet)
+void CBouquetList::deleteBouquet(CBouquet *bouquet)
 {
-	if (bouquet != NULL) {
+	if (bouquet != NULL)
+	{
 		std::vector<CBouquet *>::iterator it = find(Bouquets.begin(), Bouquets.end(), bouquet);
 
-		if (it != Bouquets.end()) {
+		if (it != Bouquets.end())
+		{
 			Bouquets.erase(it);
 			delete bouquet;
 		}
@@ -120,11 +121,13 @@ t_bouquet_id CBouquetList::getActiveBouquetNumber()
 }
 
 #if 0
-void CBouquetList::adjustToChannel( int nChannelNr)
+void CBouquetList::adjustToChannel(int nChannelNr)
 {
-	for (uint32_t i=0; i<Bouquets.size(); i++) {
+	for (uint32_t i = 0; i < Bouquets.size(); i++)
+	{
 		int nChannelPos = Bouquets[i]->channelList->hasChannel(nChannelNr);
-		if (nChannelPos > -1) {
+		if (nChannelPos > -1)
+		{
 			selected = i;
 			Bouquets[i]->channelList->setSelected(nChannelPos);
 			return;
@@ -132,9 +135,11 @@ void CBouquetList::adjustToChannel( int nChannelNr)
 	}
 }
 #endif
+
 bool CBouquetList::hasChannelID(t_channel_id channel_id)
 {
-	for (uint32_t i = 0; i < Bouquets.size(); i++) {
+	for (uint32_t i = 0; i < Bouquets.size(); i++)
+	{
 		int nChannelPos = Bouquets[i]->channelList->hasChannelID(channel_id);
 		if (nChannelPos > -1)
 			return true;
@@ -144,21 +149,25 @@ bool CBouquetList::hasChannelID(t_channel_id channel_id)
 
 bool CBouquetList::adjustToChannelID(t_channel_id channel_id)
 {
-//printf("CBouquetList::adjustToChannelID [%s] to %llx, selected %d size %d\n", name.c_str(), channel_id, selected, Bouquets.size());
-	if(selected < Bouquets.size()) {
+	//printf("CBouquetList::adjustToChannelID [%s] to %llx, selected %d size %d\n", name.c_str(), channel_id, selected, Bouquets.size());
+	if (selected < Bouquets.size())
+	{
 		int nChannelPos = Bouquets[selected]->channelList->hasChannelID(channel_id);
-		if(nChannelPos > -1) {
-//printf("CBouquetList::adjustToChannelID [%s] to %llx -> not needed\n", name.c_str(), channel_id);
+		if (nChannelPos > -1)
+		{
+	//printf("CBouquetList::adjustToChannelID [%s] to %llx -> not needed\n", name.c_str(), channel_id);
 			Bouquets[selected]->channelList->setSelected(nChannelPos);
 			return true;
 		}
 	}
-//printf("CBouquetList::adjustToChannelID [%s] to %llx\n", name.c_str(), channel_id);
-	for (uint32_t i=0; i < Bouquets.size(); i++) {
-		if(i == selected)
+	//printf("CBouquetList::adjustToChannelID [%s] to %llx\n", name.c_str(), channel_id);
+	for (uint32_t i = 0; i < Bouquets.size(); i++)
+	{
+		if (i == selected)
 			continue;
 		int nChannelPos = Bouquets[i]->channelList->hasChannelID(channel_id);
-		if (nChannelPos > -1) {
+		if (nChannelPos > -1)
+		{
 			selected = i;
 			Bouquets[i]->channelList->setSelected(nChannelPos);
 			return true;
@@ -166,47 +175,50 @@ bool CBouquetList::adjustToChannelID(t_channel_id channel_id)
 	}
 	return false;
 }
-/* used in channellist to switch bouquets up/down */
-int CBouquetList::showChannelList( int nBouquet)
+
+// used in channellist to switch bouquets up/down
+int CBouquetList::showChannelList(int nBouquet)
 {
-	if ((nBouquet < 0)|| (nBouquet >= (int) Bouquets.size()))
+	if ((nBouquet < 0) || (nBouquet >= (int) Bouquets.size()))
 		nBouquet = selected;
 
 	int nNewChannel = Bouquets[nBouquet]->channelList->exec();
-	if (nNewChannel > -1) {
+	if (nNewChannel > -1)
+	{
 		selected = nBouquet;
 		nNewChannel = -2;
 	}
 	return nNewChannel;
 }
-/* bShowChannelList default to false , return seems not checked anywhere */
-int CBouquetList::activateBouquet( int id, bool bShowChannelList)
+
+// bShowChannelList default to false , return seems not checked anywhere
+int CBouquetList::activateBouquet(int id, bool bShowChannelList)
 {
 	int res = -1;
 
-	if((id >= 0) && (id < (int) Bouquets.size()))
+	if ((id >= 0) && (id < (int) Bouquets.size()))
 		selected = id;
 
-	if (bShowChannelList) {
+	if (bShowChannelList)
+	{
 		res = Bouquets[selected]->channelList->exec();
-		if(res > -1)
+		if (res > -1)
 			res = -2;
 	}
 	return res;
 }
 
-int CBouquetList::exec( bool bShowChannelList)
+int CBouquetList::exec(bool bShowChannelList)
 {
-	/* select bouquet to show */
 	int res = show(bShowChannelList);
-//printf("Bouquet-exec: res %d bShowChannelList %d\n", res, bShowChannelList); fflush(stdout);
+	//printf("Bouquet-exec: res %d bShowChannelList %d\n", res, bShowChannelList); fflush(stdout);
 
-	if(!bShowChannelList)
+	if (!bShowChannelList)
 		return res;
-	/* if >= 0, call activateBouquet to show channel list */
-	if ( res > -1) {
+
+	if (res > -1)
 		return activateBouquet(selected, bShowChannelList);
-	}
+
 	return res;
 }
 
@@ -217,28 +229,31 @@ int CBouquetList::doMenu()
 	static int old_selected = 0;
 	signed int bouquet_id;
 	char cnt[5];
-	CZapitBouquet * tmp, * zapitBouquet;
-	ZapitChannelList* channels;
+	CZapitBouquet *tmp, *zapitBouquet;
+	ZapitChannelList *channels;
 
-	if(Bouquets.empty() || g_settings.minimode)
+	if (Bouquets.empty() || g_settings.minimode)
 		return 0;
 
 	zapitBouquet = Bouquets[selected]->zapitBouquet;
-	/* zapitBouquet not NULL only on real bouquets, satellitePosition is set for providers or SAT */
-	if(!zapitBouquet && Bouquets[selected]->satellitePosition == INVALID_SAT_POSITION)
+
+	// zapitBouquet not NULL only on real bouquets, satellitePosition is set for providers or SAT
+	if (!zapitBouquet && Bouquets[selected]->satellitePosition == INVALID_SAT_POSITION)
 		return 0;
 
-	CMenuWidget* menu = new CMenuWidget(LOCALE_CHANNELLIST_EDIT, NEUTRINO_ICON_SETTINGS);
+	CMenuWidget *menu = new CMenuWidget(LOCALE_CHANNELLIST_EDIT, NEUTRINO_ICON_SETTINGS);
 	menu->enableFade(false);
 	menu->enableSaveScreen(true);
-	CMenuSelectorTarget * selector = new CMenuSelectorTarget(&select);
+	CMenuSelectorTarget *selector = new CMenuSelectorTarget(&select);
 
 	int old_epg = zapitBouquet ? zapitBouquet->bScanEpg : 0;
 	int old_ci = zapitBouquet ? zapitBouquet->bUseCI : 0;
 	sprintf(cnt, "%d", i);
-	/* FIXME menu centered different than bouquet list ??? */
-	/* provider bouquet */
-	if (zapitBouquet && !zapitBouquet->bUser) {
+
+	// FIXME menu centered different than bouquet list ???
+	// provider bouquet
+	if (zapitBouquet && !zapitBouquet->bUser)
+	{
 		menu->addItem(new CMenuForwarder(LOCALE_FAVORITES_COPY, true, NULL, selector, cnt, CRCInput::RC_blue), old_selected == i ++);
 		if ((!zapitBouquet->bWebtv && !zapitBouquet->bWebradio) && g_settings.epg_scan == CEpgScan::SCAN_SEL)
 			menu->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_EPG_SCAN, &zapitBouquet->bScanEpg, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
@@ -248,18 +263,20 @@ int CBouquetList::doMenu()
 		delete menu;
 		delete selector;
 		printf("CBouquetList::doMenu: %d selected\n", select);
-		if (old_epg != zapitBouquet->bScanEpg) {
+		if (old_epg != zapitBouquet->bScanEpg)
+		{
 			save_bouquets = true;
 			CNeutrinoApp::getInstance()->MarkBouquetsChanged();
 			ret = -1;
 		}
-		if (old_ci != zapitBouquet->bUseCI) {
+		if (old_ci != zapitBouquet->bUseCI)
+		{
 			channels = &zapitBouquet->tvChannels;
-			for(int li = 0; li < (int) channels->size(); li++)
+			for (int li = 0; li < (int) channels->size(); li++)
 				(*channels)[li]->bUseCI = zapitBouquet->bUseCI;
 
 			channels = &zapitBouquet->radioChannels;
-			for(int li = 0; li < (int) channels->size(); li++)
+			for (int li = 0; li < (int) channels->size(); li++)
 				(*channels)[li]->bUseCI = zapitBouquet->bUseCI;
 
 			CServiceManager::getInstance()->SetCIFilter();
@@ -268,37 +285,47 @@ int CBouquetList::doMenu()
 			ret = -1;
 		}
 
-		if(select >= 0) {
+		if (select >= 0)
+		{
 			bool added = false;
 			old_selected = select;
-			switch(select) {
-				case 0: // copy to favorites
+			switch (select)
+			{
+				// copy to favorites
+				case 0:
 					hide();
 					bouquet_id = g_bouquetManager->existsUBouquet(Bouquets[selected]->channelList->getName());
-					if(bouquet_id < 0) {
+					if (bouquet_id < 0)
+					{
 						tmp = g_bouquetManager->addBouquet(Bouquets[selected]->channelList->getName(), true);
 						bouquet_id = g_bouquetManager->existsUBouquet(Bouquets[selected]->channelList->getName());
-					} else
+					}
+					else
 						tmp = g_bouquetManager->Bouquets[bouquet_id];
 
-					if(bouquet_id < 0)
+					if (bouquet_id < 0)
 						return 0;
 
 					channels = &zapitBouquet->tvChannels;
-					for(int li = 0; li < (int) channels->size(); li++) {
-						if (!g_bouquetManager->existsChannelInBouquet(bouquet_id, ((*channels)[li])->getChannelID())) {
+					for (int li = 0; li < (int) channels->size(); li++)
+					{
+						if (!g_bouquetManager->existsChannelInBouquet(bouquet_id, ((*channels)[li])->getChannelID()))
+						{
 							added = true;
 							tmp->addService((*channels)[li]);
 						}
 					}
 					channels = &zapitBouquet->radioChannels;
-					for(int li = 0; li < (int) channels->size(); li++) {
-						if (!g_bouquetManager->existsChannelInBouquet(bouquet_id, ((*channels)[li])->getChannelID())) {
+					for (int li = 0; li < (int) channels->size(); li++)
+					{
+						if (!g_bouquetManager->existsChannelInBouquet(bouquet_id, ((*channels)[li])->getChannelID()))
+						{
 							added = true;
 							tmp->addService((*channels)[li]);
 						}
 					}
-					if (added) {
+					if (added)
+					{
 						CNeutrinoApp::getInstance()->MarkFavoritesChanged();
 						CNeutrinoApp::getInstance()->MarkChannelsInit();
 						return 1;
@@ -308,8 +335,10 @@ int CBouquetList::doMenu()
 					break;
 			}
 		}
-	} else {
-		/* user or satellite bouquet */
+	}
+	else
+	{
+		// user or satellite bouquet
 		menu->addItem(new CMenuForwarder(LOCALE_BOUQUETEDITOR_DELETE, true, NULL, selector, cnt, CRCInput::RC_red), old_selected == i ++);
 		if (zapitBouquet && (!zapitBouquet->bWebtv && !zapitBouquet->bWebradio) && (g_settings.epg_scan == CEpgScan::SCAN_SEL))
 			menu->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_EPG_SCAN, &zapitBouquet->bScanEpg, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
@@ -319,18 +348,20 @@ int CBouquetList::doMenu()
 		menu->exec(NULL, "");
 		delete menu;
 		delete selector;
-		if (zapitBouquet && (old_epg != zapitBouquet->bScanEpg)) {
+		if (zapitBouquet && (old_epg != zapitBouquet->bScanEpg))
+		{
 			save_bouquets = true;
 			CNeutrinoApp::getInstance()->MarkFavoritesChanged();
 			ret = -1;
 		}
-		if (zapitBouquet && (old_ci != zapitBouquet->bUseCI)) {
+		if (zapitBouquet && (old_ci != zapitBouquet->bUseCI))
+		{
 			channels = &zapitBouquet->tvChannels;
-			for(int li = 0; li < (int) channels->size(); li++)
+			for (int li = 0; li < (int) channels->size(); li++)
 				(*channels)[li]->bUseCI = zapitBouquet->bUseCI;
 
 			channels = &zapitBouquet->radioChannels;
-			for(int li = 0; li < (int) channels->size(); li++)
+			for (int li = 0; li < (int) channels->size(); li++)
 				(*channels)[li]->bUseCI = zapitBouquet->bUseCI;
 
 			CServiceManager::getInstance()->SetCIFilter();
@@ -340,22 +371,27 @@ int CBouquetList::doMenu()
 		}
 
 		printf("CBouquetList::doMenu: %d selected\n", select);
-		if(select >= 0) {
+		if (select >= 0)
+		{
 			old_selected = select;
 
-			int result = ShowMsg ( LOCALE_BOUQUETEDITOR_DELETE, Bouquets[selected]->channelList->getName(), CMsgBox::mbrNo, CMsgBox::mbYes | CMsgBox::mbNo );
-			if(result != CMsgBox::mbrYes)
+			int result = ShowMsg(LOCALE_BOUQUETEDITOR_DELETE, Bouquets[selected]->channelList->getName(), CMsgBox::mbrNo, CMsgBox::mbYes | CMsgBox::mbNo);
+			if (result != CMsgBox::mbrYes)
 				return 0;
 
-			if (zapitBouquet) {
+			if (zapitBouquet)
+			{
 				bouquet_id = g_bouquetManager->existsUBouquet(Bouquets[selected]->channelList->getName());
-				if(bouquet_id >= 0) {
+				if (bouquet_id >= 0)
+				{
 					g_bouquetManager->deleteBouquet(bouquet_id);
 					CNeutrinoApp::getInstance()->MarkFavoritesChanged();
 					CNeutrinoApp::getInstance()->MarkChannelsInit();
 					return 1;
 				}
-			} else {
+			}
+			else
+			{
 				CServiceManager::getInstance()->RemovePosition(Bouquets[selected]->satellitePosition);
 				g_bouquetManager->loadBouquets();
 				g_bouquetManager->deletePosition(Bouquets[selected]->satellitePosition);
@@ -379,27 +415,29 @@ const struct button_label CBouquetListButtons[4] =
 
 void CBouquetList::updateSelection(int newpos)
 {
-	if (newpos < 0) /* to avoid all callers having to check */
+	if (newpos < 0) // to avoid all callers having to check
 		return;
-	if((int) selected != newpos) {
+	if ((int) selected != newpos)
+	{
 		int prev_selected = selected;
 		unsigned int oldliststart = liststart;
 
 		selected = newpos;
-		liststart = (selected/listmaxshow)*listmaxshow;
+		liststart = (selected / listmaxshow) * listmaxshow;
 		if (oldliststart != liststart)
 			paint();
-		else {
+		else
+		{
 			paintItem(prev_selected - liststart);
 			paintItem(selected - liststart);
 		}
 	}
 }
 
-/* bShowChannelList default to true, returns new bouquet or -1/-2 */
+// bShowChannelList default to true, returns new bouquet or -1/-2
 int CBouquetList::show(bool bShowChannelList)
 {
-	neutrino_msg_t      msg;
+	neutrino_msg_t msg;
 	neutrino_msg_data_t data;
 	int res = CHANLIST_CANCEL;
 	int icol_w, icol_h;
@@ -408,7 +446,7 @@ int CBouquetList::show(bool bShowChannelList)
 	int h_max_icon = 0;
 	favonly = !bShowChannelList;
 
-	for (unsigned int count = 0; count < sizeof(CBouquetListButtons)/sizeof(CBouquetListButtons[0]); count++)
+	for (unsigned int count = 0; count < sizeof(CBouquetListButtons) / sizeof(CBouquetListButtons[0]); count++)
 	{
 		int w_text = g_Font[SNeutrinoSettings::FONT_TYPE_BUTTON_TEXT]->getRenderWidth(g_Locale->getText(CBouquetListButtons[count].locale));
 		w_max_text = std::max(w_max_text, w_text) + OFFSET_INNER_SMALL;
@@ -425,20 +463,20 @@ int CBouquetList::show(bool bShowChannelList)
 	   It would be better to get the needed width from
 	   CComponententsFooter class.
 	*/
-	width  = (sizeof(CBouquetListButtons)/sizeof(CBouquetListButtons[0]))*(w_max_icon + w_max_text + 2*OFFSET_INNER_MID);
-	height = 16*item_height;
+	width = (sizeof(CBouquetListButtons) / sizeof(CBouquetListButtons[0])) * (w_max_icon + w_max_text + 2 * OFFSET_INNER_MID);
+	height = 16 * item_height;
 
 	header_height = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight();
 	footer_height = header_height;
-	listmaxshow = (height - header_height - footer_height)/item_height;
-	height      = header_height + footer_height + listmaxshow*item_height; // recalc height
+	listmaxshow = (height - header_height - footer_height) / item_height;
+	height = header_height + footer_height + listmaxshow * item_height; // recalc height
 
 	x = getScreenStartX(width);
 	y = getScreenStartY(height);
 
-	int lmaxpos= 1;
-	int i= Bouquets.size();
-	while ((i= i/10)!=0)
+	int lmaxpos = 1;
+	int i = Bouquets.size();
+	while ((i = i / 10) != 0)
 		lmaxpos++;
 
 	CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, "");
@@ -450,129 +488,166 @@ int CBouquetList::show(bool bShowChannelList)
 	paint();
 
 	int oldselected = selected;
-	int firstselected = selected+ 1;
+	int firstselected = selected + 1;
 	int zapOnExit = false;
 
-	unsigned int chn= 0;
-	int pos= lmaxpos;
+	unsigned int chn = 0;
+	int pos = lmaxpos;
 
 	int timeout = g_settings.timing[SNeutrinoSettings::TIMING_CHANLIST];
 	uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
 
-	bool loop=true;
-	while (loop) {
-		g_RCInput->getMsgAbsoluteTimeout( &msg, &data, &timeoutEnd );
+	bool loop = true;
+	while (loop)
+	{
+		g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd);
 
-		if ( msg <= CRCInput::RC_MaxRC )
+		if (msg <= CRCInput::RC_MaxRC)
 			timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
 
-		if((msg == NeutrinoMessages::EVT_TIMER) && (data == fader.GetFadeTimer())) {
-			if(fader.FadeDone())
+		if ((msg == NeutrinoMessages::EVT_TIMER) && (data == fader.GetFadeTimer()))
+		{
+			if (fader.FadeDone())
 				loop = false;
 		}
-		else if ((msg == CRCInput::RC_timeout                             ) ||
-				(msg == (neutrino_msg_t) g_settings.key_channelList_cancel) ||
-				((msg == (neutrino_msg_t) g_settings.key_favorites) && (CNeutrinoApp::getInstance()->GetChannelMode() == LIST_MODE_FAV)))
+		else if ((msg == CRCInput::RC_timeout) || (msg == (neutrino_msg_t) g_settings.key_channelList_cancel) ||
+			((msg == (neutrino_msg_t) g_settings.key_favorites) && (CNeutrinoApp::getInstance()->GetChannelMode() == LIST_MODE_FAV)))
 		{
 			selected = oldselected;
-			if(fader.StartFadeOut()) {
+			if (fader.StartFadeOut())
+			{
 				timeoutEnd = CRCInput::calcTimeoutEnd(1);
 				msg = 0;
-			} else
-				loop=false;
+			}
+			else
+				loop = false;
 		}
-		else if(msg == CRCInput::RC_red || msg == (neutrino_msg_t) g_settings.key_favorites) {
-			if (!favonly && CNeutrinoApp::getInstance()->GetChannelMode() != LIST_MODE_FAV) {
+		else if (msg == CRCInput::RC_red || msg == (neutrino_msg_t) g_settings.key_favorites)
+		{
+			if (!favonly && CNeutrinoApp::getInstance()->GetChannelMode() != LIST_MODE_FAV)
+			{
 				CNeutrinoApp::getInstance()->SetChannelMode(LIST_MODE_FAV);
 				hide();
 				return CHANLIST_CHANGE_MODE;
 			}
-		} else if(msg == CRCInput::RC_green) {
-			if (!favonly && CNeutrinoApp::getInstance()->GetChannelMode() != LIST_MODE_PROV) {
+		}
+		else if (msg == CRCInput::RC_green)
+		{
+			if (!favonly && CNeutrinoApp::getInstance()->GetChannelMode() != LIST_MODE_PROV)
+			{
 				CNeutrinoApp::getInstance()->SetChannelMode(LIST_MODE_PROV);
 				hide();
 				return CHANLIST_CHANGE_MODE;
 			}
-		} else if(msg == CRCInput::RC_yellow || msg == CRCInput::RC_sat) {
-			if(!favonly && bShowChannelList && CNeutrinoApp::getInstance()->GetChannelMode() != LIST_MODE_SAT) {
+		}
+		else if (msg == CRCInput::RC_yellow || msg == CRCInput::RC_sat)
+		{
+			if (!favonly && bShowChannelList && CNeutrinoApp::getInstance()->GetChannelMode() != LIST_MODE_SAT)
+			{
 				CNeutrinoApp::getInstance()->SetChannelMode(LIST_MODE_SAT);
 				hide();
 				return CHANLIST_CHANGE_MODE;
 			}
-		} else if(msg == CRCInput::RC_blue) {
-			if(!favonly && bShowChannelList && CNeutrinoApp::getInstance()->GetChannelMode() != LIST_MODE_ALL) {
+		}
+		else if (msg == CRCInput::RC_blue)
+		{
+			if (!favonly && bShowChannelList && CNeutrinoApp::getInstance()->GetChannelMode() != LIST_MODE_ALL)
+			{
 				CNeutrinoApp::getInstance()->SetChannelMode(LIST_MODE_ALL);
 				hide();
 				return CHANLIST_CHANGE_MODE;
 			}
-		} else if(msg == CRCInput::RC_www) {
-			if(!favonly && bShowChannelList && CNeutrinoApp::getInstance()->GetChannelMode() != LIST_MODE_WEB) {
+		}
+		else if (msg == CRCInput::RC_www)
+		{
+			if (!favonly && bShowChannelList && CNeutrinoApp::getInstance()->GetChannelMode() != LIST_MODE_WEB)
+			{
 				CNeutrinoApp::getInstance()->SetChannelMode(LIST_MODE_WEB);
 				hide();
 				return CHANLIST_CHANGE_MODE;
 			}
 		}
-		else if ( msg == CRCInput::RC_setup) {
-			if (!favonly && !Bouquets.empty()) {
+		else if (msg == CRCInput::RC_setup)
+		{
+			if (!favonly && !Bouquets.empty())
+			{
 				int ret = doMenu();
-				if(ret > 0) {
+				if (ret > 0)
+				{
 					res = CHANLIST_NO_RESTORE;
 					loop = false;
-				} else if(ret < 0) {
+				}
+				else if (ret < 0)
+				{
 					paintHead();
 					paint();
 				}
 			}
 		}
-		else if ( msg == (neutrino_msg_t) g_settings.key_list_start ) {
+		else if (msg == (neutrino_msg_t) g_settings.key_list_start)
+		{
 			if (!Bouquets.empty())
 				updateSelection(0);
 		}
-		else if ( msg == (neutrino_msg_t) g_settings.key_list_end ) {
+		else if (msg == (neutrino_msg_t) g_settings.key_list_end)
+		{
 			if (!Bouquets.empty())
-				updateSelection(Bouquets.size()-1);
+				updateSelection(Bouquets.size() - 1);
 		}
 		else if (msg == CRCInput::RC_up || (int) msg == g_settings.key_pageup ||
-			 msg == CRCInput::RC_down || (int) msg == g_settings.key_pagedown)
+			msg == CRCInput::RC_down || (int) msg == g_settings.key_pagedown)
 		{
 			int new_selected = UpDownKey(Bouquets, msg, listmaxshow, selected);
 			updateSelection(new_selected);
 		}
-		else if(msg == (neutrino_msg_t)g_settings.key_bouquet_up || msg == (neutrino_msg_t)g_settings.key_bouquet_down) {
-			if(bShowChannelList) {
+		else if (msg == (neutrino_msg_t)g_settings.key_bouquet_up || msg == (neutrino_msg_t)g_settings.key_bouquet_down)
+		{
+			if (bShowChannelList)
+			{
 				int mode = CNeutrinoApp::getInstance()->GetChannelMode();
 				mode += (msg == (neutrino_msg_t)g_settings.key_bouquet_down) ? -1 : 1;
-				if(mode < 0)
+				if (mode < 0)
 					mode = LIST_MODE_LAST - 1;
-				else if(mode >= LIST_MODE_LAST)
+				else if (mode >= LIST_MODE_LAST)
 					mode = 0;
 				CNeutrinoApp::getInstance()->SetChannelMode(mode);
 				hide();
 				return CHANLIST_CHANGE_MODE;
 			}
 		}
-		else if ( msg == CRCInput::RC_ok ) {
-			if(!Bouquets.empty() /* && (!bShowChannelList || !Bouquets[selected]->channelList->isEmpty())*/) {
+		else if (msg == CRCInput::RC_ok)
+		{
+			if (!Bouquets.empty() /*&& (!bShowChannelList || !Bouquets[selected]->channelList->isEmpty())*/)
+			{
 				zapOnExit = true;
-				loop=false;
+				loop = false;
 			}
 		}
-		else if (CRCInput::isNumeric(msg)) {
-			if (!Bouquets.empty()) {
-				if (pos == lmaxpos) {
-					if (msg == CRCInput::RC_0) {
+		else if (CRCInput::isNumeric(msg))
+		{
+			if (!Bouquets.empty())
+			{
+				if (pos == lmaxpos)
+				{
+					if (msg == CRCInput::RC_0)
+					{
 						chn = firstselected;
 						pos = lmaxpos;
-					} else {
+					}
+					else
+					{
 						chn = CRCInput::getNumericValue(msg);
 						pos = 1;
 					}
-				} else {
-					chn = chn*10 + CRCInput::getNumericValue(msg);
+				}
+				else
+				{
+					chn = chn * 10 + CRCInput::getNumericValue(msg);
 					pos++;
 				}
 
-				if (chn > Bouquets.size()) {
+				if (chn > Bouquets.size())
+				{
 					chn = firstselected;
 					pos = lmaxpos;
 				}
@@ -580,12 +655,17 @@ int CBouquetList::show(bool bShowChannelList)
 				int new_selected = (chn - 1) % Bouquets.size(); // is % necessary (i.e. can firstselected be > Bouquets.size()) ?
 				updateSelection(new_selected);
 			}
-		} else if (msg == NeutrinoMessages::EVT_SERVICESCHANGED || msg == NeutrinoMessages::EVT_BOUQUETSCHANGED) {
+		}
+		else if (msg == NeutrinoMessages::EVT_SERVICESCHANGED || msg == NeutrinoMessages::EVT_BOUQUETSCHANGED)
+		{
 			g_RCInput->postMsg(msg, data);
 			loop = false;
 			res = CHANLIST_CANCEL_ALL;
-		} else {
-			if ( CNeutrinoApp::getInstance()->handleMsg( msg, data ) & messages_return::cancel_all ) {
+		}
+		else
+		{
+			if (CNeutrinoApp::getInstance()->handleMsg(msg, data) & messages_return::cancel_all)
+			{
 				loop = false;
 				res = CHANLIST_CANCEL_ALL;
 			}
@@ -604,14 +684,17 @@ int CBouquetList::show(bool bShowChannelList)
 
 	CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO);
 
-	if (save_bouquets) {
+	if (save_bouquets)
+	{
 		save_bouquets = false;
+
 #if 0
 		if (CNeutrinoApp::getInstance()->GetChannelMode() == LIST_MODE_FAV)
 			g_bouquetManager->saveUBouquets();
 		else
 			g_bouquetManager->saveBouquets();
 #endif
+
 		if (g_settings.epg_scan == CEpgScan::SCAN_SEL)
 			CEpgScan::getInstance()->Start();
 	}
@@ -630,13 +713,13 @@ void CBouquetList::hide()
 
 void CBouquetList::paintItem(int pos)
 {
-	int ypos = y + header_height + pos*item_height;
+	int ypos = y + header_height + pos * item_height;
 	bool iscurrent = true;
 	int npos = liststart + pos;
-	const char * lname = NULL;
+	const char *lname = NULL;
 
 	bool i_selected	= npos == (int) selected;
-	int i_radius	= RADIUS_NONE;
+	int i_radius = RADIUS_NONE;
 
 	fb_pixel_t color;
 	fb_pixel_t bgcolor;
@@ -655,47 +738,52 @@ void CBouquetList::paintItem(int pos)
 
 	if (i_selected)
 	{
-		if(npos < (int) Bouquets.size())
+		if (npos < (int) Bouquets.size())
 			CVFD::getInstance()->showMenuText(0, lname, -1, true);
 #ifdef ENABLE_GRAPHLCD
-		if(g_settings.glcd_enable)
+		if (g_settings.glcd_enable)
 			cGLCD::lockChannel(g_Locale->getText(LOCALE_BOUQUETLIST_HEAD), lname, 0);
 #endif
 #ifdef ENABLE_LCD4LINUX
-		if(g_settings.lcd4l_support)
+		if (g_settings.lcd4l_support)
 			CLCD4l::getInstance()->CreateMenuFile(lname, g_settings.lcd4l_convert);
 #endif
 	}
 	else
 	{
-		if(!favonly && (npos < (int) Bouquets.size()))
+		if (!favonly && (npos < (int) Bouquets.size()))
 			iscurrent = !Bouquets[npos]->channelList->isEmpty();
 
 		if (!iscurrent)
 		{
-			//inactive colors? Is this correct?
+			// inactive colors? Is this correct?
 			color = COL_MENUCONTENTINACTIVE_TEXT;
 			//bgcolor = COL_MENUCONTENTINACTIVE_PLUS_0;
 		}
 	}
 
-	if (npos < (int) Bouquets.size()) {
+	if (npos < (int) Bouquets.size())
+	{
 		char num[12];
 		snprintf(num, sizeof(num), "%d", npos + 1);
 		int iw = 0, ih = 0;
 		if ((g_settings.epg_scan == CEpgScan::SCAN_SEL) &&
-				Bouquets[npos]->zapitBouquet && Bouquets[npos]->zapitBouquet->bScanEpg) {
+			Bouquets[npos]->zapitBouquet && Bouquets[npos]->zapitBouquet->bScanEpg)
+		{
 			frameBuffer->getIconSize(NEUTRINO_ICON_MARKER_EPG, &iw, &ih);
-			if (iw && ih) {
+			if (iw && ih)
+			{
 				int icon_x = x + width - SCROLLBAR_WIDTH - OFFSET_INNER_MID - iw;
 				frameBuffer->paintIcon(NEUTRINO_ICON_MARKER_EPG, icon_x, ypos, item_height);
 				iw = iw + OFFSET_INNER_MID;
 			}
 		}
-		if (Bouquets[npos]->zapitBouquet && Bouquets[npos]->zapitBouquet->bUseCI) {
+		if (Bouquets[npos]->zapitBouquet && Bouquets[npos]->zapitBouquet->bUseCI)
+		{
 			int iw2 = 0;
 			frameBuffer->getIconSize(NEUTRINO_ICON_MARKER_SCRAMBLED, &iw2, &ih);
-			if (iw2 && ih) {
+			if (iw2 && ih)
+			{
 				int icon_x = x + width - SCROLLBAR_WIDTH - OFFSET_INNER_MID - iw - iw2;
 				frameBuffer->paintIcon(NEUTRINO_ICON_MARKER_SCRAMBLED, icon_x, ypos, item_height);
 				iw = iw + iw2 + OFFSET_INNER_MID;
@@ -705,7 +793,7 @@ void CBouquetList::paintItem(int pos)
 		int numpos = x + OFFSET_INNER_MID + numwidth - g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_NUMBER]->getRenderWidth(num);
 		g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_NUMBER]->RenderString(numpos, ypos + item_height, numwidth + OFFSET_INNER_SMALL, num, color, item_height);
 
-		g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->RenderString(x + OFFSET_INNER_MID + numwidth + OFFSET_INNER_MID, ypos + item_height, width - numwidth - 2*OFFSET_INNER_MID - iw - SCROLLBAR_WIDTH, lname, color);
+		g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->RenderString(x + OFFSET_INNER_MID + numwidth + OFFSET_INNER_MID, ypos + item_height, width - numwidth - 2 * OFFSET_INNER_MID - iw - SCROLLBAR_WIDTH, lname, color);
 		//CVFD::getInstance()->showMenuText(0, bouq->channelList->getName(), -1, true);
 	}
 }
@@ -714,29 +802,30 @@ void CBouquetList::paintHead()
 {
 	std::string icon("");
 	CComponentsHeader header(x, y, width, header_height, name, icon, CComponentsHeader::CC_BTN_LEFT | CComponentsHeader::CC_BTN_RIGHT | CComponentsHeader::CC_BTN_MENU);
-	header.enableShadow( CC_SHADOW_RIGHT | CC_SHADOW_CORNER_TOP_RIGHT | CC_SHADOW_CORNER_BOTTOM_RIGHT, -1, true);
+	header.enableShadow(CC_SHADOW_RIGHT | CC_SHADOW_CORNER_TOP_RIGHT | CC_SHADOW_CORNER_BOTTOM_RIGHT, -1, true);
 	header.paint(CC_SAVE_SCREEN_NO);
 }
 
 void CBouquetList::paint()
 {
-	//ensure stop info clock before paint this window
+	// ensure stop info clock before paint this window
 	CInfoClock::getInstance()->block();
-	liststart = (selected/listmaxshow)*listmaxshow;
-	int lastnum =  liststart + listmaxshow;
+	liststart = (selected / listmaxshow) * listmaxshow;
+	int lastnum = liststart + listmaxshow;
 
 	numwidth = 0;
 	int maxDigitWidth = g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_NUMBER]->getMaxDigitWidth();
 	int _lastnum = lastnum;
-        while (_lastnum) {
-                numwidth += maxDigitWidth;
-                _lastnum /= 10;
-        }
+	while (_lastnum)
+	{
+		numwidth += maxDigitWidth;
+		_lastnum /= 10;
+	}
 
 	frameBuffer->paintBoxRel(x, y + header_height, width, height - header_height - footer_height, COL_MENUCONTENT_PLUS_0);
 
 	// no buttons in favonly mode
-	int numButtons = (favonly) ? 0 : sizeof(CBouquetListButtons)/sizeof(CBouquetListButtons[0]);
+	int numButtons = (favonly) ? 0 : sizeof(CBouquetListButtons) / sizeof(CBouquetListButtons[0]);
 
 	CComponentsFooter footer;
 	footer.enableShadow(CC_SHADOW_ON, -1, true);
@@ -745,13 +834,11 @@ void CBouquetList::paint()
 	if (!Bouquets.empty())
 	{
 		for (unsigned int count = 0; count < listmaxshow; count++)
-		{
 			paintItem(count);
-		}
 	}
 
 	int total_pages;
 	int current_page;
 	getScrollBarData(&total_pages, &current_page, Bouquets.size(), listmaxshow, selected);
-	paintScrollBar(x + width - SCROLLBAR_WIDTH, y + header_height, SCROLLBAR_WIDTH, item_height*listmaxshow, total_pages, current_page, CC_SHADOW_RIGHT_CORNER_ALL);
+	paintScrollBar(x + width - SCROLLBAR_WIDTH, y + header_height, SCROLLBAR_WIDTH, item_height * listmaxshow, total_pages, current_page, CC_SHADOW_RIGHT_CORNER_ALL);
 }
diff --git a/src/gui/bouquetlist.h b/src/gui/bouquetlist.h
index 94c7a617e..81d400dbf 100644
--- a/src/gui/bouquetlist.h
+++ b/src/gui/bouquetlist.h
@@ -29,7 +29,6 @@
 	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-
 #ifndef __bouquetlist__
 #define __bouquetlist__
 
@@ -45,22 +44,21 @@ class CFrameBuffer;
 
 typedef enum bouquetSwitchMode
 {
-    bsmBouquets,	// pressing OK shows list of all Bouquets
-    bsmChannels,	// pressing OK shows list of all channels of active bouquets
-    bsmAllChannels	// OK shows lsit of all channels
+	bsmBouquets,	// pressing OK shows list of all Bouquets
+	bsmChannels,	// pressing OK shows list of all channels of active bouquets
+	bsmAllChannels	// OK shows lsit of all channels
 } BouquetSwitchMode;
 
 class CBouquet
 {
-
 	public:
-		int				unique_key;
-		bool			bLocked;
-		CChannelList*	channelList;
-		CZapitBouquet * zapitBouquet;
+		int unique_key;
+		bool bLocked;
+		CChannelList *channelList;
+		CZapitBouquet *zapitBouquet;
 		t_satellite_position satellitePosition;
 
-		CBouquet(const int Unique_key, const char * const Name, const bool locked, bool vlist = false)
+		CBouquet(const int Unique_key, const char *const Name, const bool locked, bool vlist = false)
 		{
 			zapitBouquet = NULL;
 			unique_key = Unique_key;
@@ -80,24 +78,24 @@ class CBouquet
 class CBouquetList : public CListHelpers
 {
 	private:
-		CFrameBuffer		*frameBuffer;
+		CFrameBuffer *frameBuffer;
 
-		std::string		name;
-		unsigned int		selected;
-		unsigned int		liststart;
-		unsigned int		listmaxshow;
-		unsigned int		numwidth;
-		int			item_height;
-		int			header_height;
-		int			footer_height;
+		std::string name;
+		unsigned int selected;
+		unsigned int liststart;
+		unsigned int listmaxshow;
+		unsigned int numwidth;
+		int item_height;
+		int header_height;
+		int footer_height;
 
-		int		width;
-		int		height;
-		int		x;
-		int		y;
+		int width;
+		int height;
+		int x;
+		int y;
 
-		bool		favonly;
-		bool		save_bouquets;
+		bool favonly;
+		bool save_bouquets;
 
 		void paintItem(int pos);
 		void paint();
@@ -107,23 +105,22 @@ class CBouquetList : public CListHelpers
 		void updateSelection(int newpos);
 
 	public:
-		CBouquetList(const char * const Name = NULL);
+		CBouquetList(const char *const Name = NULL);
 		~CBouquetList();
 
-		std::vector<CBouquet*>	Bouquets;
+		std::vector<CBouquet *>	Bouquets;
 
-		CBouquet* addBouquet(const char * const name, int BouquetKey=-1, bool locked=false );
-		CBouquet* addBouquet(CZapitBouquet * zapitBouquet);
-		void deleteBouquet(CBouquet* bouquet);
+		CBouquet *addBouquet(const char *const name, int BouquetKey = -1, bool locked = false);
+		CBouquet *addBouquet(CZapitBouquet *zapitBouquet);
+		void deleteBouquet(CBouquet *bouquet);
 		t_bouquet_id getActiveBouquetNumber();
 		int activateBouquet(int id, bool bShowChannelList);
 		int show(bool bShowChannelList = true);
 		int showChannelList(int nBouquet = -1);
 		//void adjustToChannel(int nChannelNr);
 		bool adjustToChannelID(t_channel_id channel_id);
-		int exec( bool bShowChannelList);
+		int exec(bool bShowChannelList);
 		bool hasChannelID(t_channel_id channel_id);
 };
 
-
 #endif