diff --git a/gui.pnproj b/gui.pnproj
index 9d732305..db4c5bf5 100644
--- a/gui.pnproj
+++ b/gui.pnproj
@@ -1 +1 @@
-<Project name="gui"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="source" path="source\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="fonts" path="fonts\"><File path="clock.ttf"></File><File path="font.ttf"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="images" path="images\"><File path="arrow_next.png"></File><File path="arrow_previous.png"></File><File path="background.png"></File><File path="battery.png"></File><File path="battery_bar.png"></File><File path="battery_bar_white.png"></File><File path="battery_red.png"></File><File path="battery_white.png"></File><File path="bg_options.png"></File><File path="bg_options_entry.png"></File><File path="bg_options_settings.png"></File><File path="button_dialogue_box.png"></File><File path="button_install.png"></File><File path="button_install_over.png"></File><File path="closebutton.png"></File><File path="credits_bg.png"></File><File path="credits_button.png"></File><File path="credits_button_over.png"></File><File path="dialogue_box.png"></File><File path="dialogue_box_install.png"></File><File path="dialogue_box_startgame.png"></File><File path="exit_bottom.png"></File><File path="exit_bottom_over.png"></File><File path="exit_button.png"></File><File path="exit_top.png"></File><File path="exit_top_over.png"></File><File path="favorite.png"></File><File path="keyboard_key.png"></File><File path="keyboard_key_over.png"></File><File path="keyboard_largekey_over.png"></File><File path="keyboard_mediumkey_over.png"></File><File path="keyboard_textbox.png"></File><File path="little_star.png"></File><File path="menu_button.png"></File><File path="menu_button_over.png"></File><File path="mp3_pause.png"></File><File path="mp3_stop.png"></File><File path="nocover.png"></File><File path="nodisc.png"></File><File path="player1_point.png"></File><File path="player2_point.png"></File><File path="player3_point.png"></File><File path="player4_point.png"></File><File path="progressbar.png"></File><File path="progressbar_empty.png"></File><File path="progressbar_outline.png"></File><File path="scrollbar.png"></File><File path="scrollbar_arrowdown.png"></File><File path="scrollbar_arrowup.png"></File><File path="scrollbar_box.png"></File><File path="sdcard.png"></File><File path="settings_background.png"></File><File path="settings_button.png"></File><File path="settings_button_over.png"></File><File path="settings_menu_button.png"></File><File path="startgame_arrow_left.png"></File><File path="startgame_arrow_right.png"></File><File path="tab_bg1.png"></File><File path="tab_bg2.png"></File><File path="tab_bg3.png"></File><File path="tooltip_left.png"></File><File path="tooltip_right.png"></File><File path="tooltip_tile.png"></File><File path="wbackground.png"></File><File path="wdialogue_box_startgame.png"></File><File path="wiimote.png"></File><File path="wiimote_poweroff.png"></File><File path="wiimote_poweroff_over.png"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libwbfs" path="libwbfs\"><File path="libwbfs.c"></File><File path="libwbfs.h"></File><File path="libwbfs_os.h"></File><File path="rijndael.c"></File><File path="wiidisc.c"></File><File path="wiidisc.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libwiigui" path="libwiigui\"><File path="gui.h"></File><File path="gui_button.cpp"></File><File path="gui_customoptionbrowser.cpp"></File><File path="gui_customoptionbrowser.h"></File><File path="gui_diskcover.cpp"></File><File path="gui_diskcover.h"></File><File path="gui_element.cpp"></File><File path="gui_gamebrowser.cpp"></File><File path="gui_gamebrowser.h"></File><File path="gui_image.cpp"></File><File path="gui_imagedata.cpp"></File><File path="gui_keyboard.cpp"></File><File path="gui_optionbrowser.cpp"></File><File path="gui_sound.cpp"></File><File path="gui_text.cpp"></File><File path="gui_tooltip.cpp"></File><File path="gui_trigger.cpp"></File><File path="gui_window.cpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="sounds" path="sounds\"><File path="bg_music.ogg"></File><File path="button_click.pcm"></File><File path="button_click2.pcm"></File><File path="button_over.pcm"></File><File path="credits_music.ogg"></File><File path="menuin.ogg"></File><File path="menuout.ogg"></File></MagicFolder><File path="apploader.c"></File><File path="apploader.h"></File><File path="audio.cpp"></File><File path="audio.h"></File><File path="cfg.c"></File><File path="cfg.h"></File><File path="CH2Unicode.c"></File><File path="CH2Unicode.h"></File><File path="data1"></File><File path="disc.c"></File><File path="disc.h"></File><File path="dns.c"></File><File path="dns.h"></File><File path="dvd_broadway.c"></File><File path="dvd_broadway.h"></File><File path="fatmounter.c"></File><File path="fatmounter.h"></File><File path="filelist.h"></File><File path="FreeTypeGX.cpp"></File><File path="FreeTypeGX.h"></File><File path="fst.c"></File><File path="fst.h"></File><File path="fwrite_patch.h"></File><File path="GB2Unicode.c"></File><File path="GB2Unicode.h"></File><File path="geckomenu.h"></File><File path="http.c"></File><File path="http.h"></File><File path="input.cpp"></File><File path="input.h"></File><File path="kenobiwii.h"></File><File path="language.c"></File><File path="language.h"></File><File path="main.cpp"></File><File path="main.h"></File><File path="menu.cpp"></File><File path="menu.h"></File><File path="mp3s.c"></File><File path="mp3s.h"></File><File path="oggplayer.c"></File><File path="oggplayer.h"></File><File path="partition.c"></File><File path="partition.h"></File><File path="patchcode.c"></File><File path="patchcode.h"></File><File path="patchhook.S"></File><File path="ppc.h"></File><File path="sdhc.c"></File><File path="sdhc.h"></File><File path="stub.S"></File><File path="sys.c"></File><File path="sys.h"></File><File path="usbstorage.c"></File><File path="usbstorage.h"></File><File path="utils.c"></File><File path="utils.h"></File><File path="video.cpp"></File><File path="video.h"></File><File path="video2.c"></File><File path="video2.h"></File><File path="wbfs.c"></File><File path="wbfs.h"></File><File path="wdvd.c"></File><File path="wdvd.h"></File><File path="wpad.c"></File><File path="wpad.h"></File></MagicFolder></Project>
\ No newline at end of file
+<Project name="gui"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="source" path="source\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="fonts" path="fonts\"><File path="clock.ttf"></File><File path="font.ttf"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="images" path="images\"><File path="arrow_next.png"></File><File path="arrow_previous.png"></File><File path="background.png"></File><File path="battery.png"></File><File path="battery_bar.png"></File><File path="battery_bar_white.png"></File><File path="battery_red.png"></File><File path="battery_white.png"></File><File path="bg_options.png"></File><File path="bg_options_entry.png"></File><File path="bg_options_settings.png"></File><File path="button_dialogue_box.png"></File><File path="button_install.png"></File><File path="button_install_over.png"></File><File path="closebutton.png"></File><File path="credits_bg.png"></File><File path="credits_button.png"></File><File path="credits_button_over.png"></File><File path="dialogue_box.png"></File><File path="dialogue_box_install.png"></File><File path="dialogue_box_startgame.png"></File><File path="exit_bottom.png"></File><File path="exit_bottom_over.png"></File><File path="exit_button.png"></File><File path="exit_top.png"></File><File path="exit_top_over.png"></File><File path="favorite.png"></File><File path="keyboard_key.png"></File><File path="keyboard_key_over.png"></File><File path="keyboard_largekey_over.png"></File><File path="keyboard_mediumkey_over.png"></File><File path="keyboard_textbox.png"></File><File path="little_star.png"></File><File path="menu_button.png"></File><File path="menu_button_over.png"></File><File path="mp3_pause.png"></File><File path="mp3_stop.png"></File><File path="nocover.png"></File><File path="nodisc.png"></File><File path="not_favorite.png"></File><File path="player1_point.png"></File><File path="player2_point.png"></File><File path="player3_point.png"></File><File path="player4_point.png"></File><File path="progressbar.png"></File><File path="progressbar_empty.png"></File><File path="progressbar_outline.png"></File><File path="scrollbar.png"></File><File path="scrollbar_arrowdown.png"></File><File path="scrollbar_arrowup.png"></File><File path="scrollbar_box.png"></File><File path="sdcard.png"></File><File path="settings_background.png"></File><File path="settings_button.png"></File><File path="settings_button_over.png"></File><File path="settings_menu_button.png"></File><File path="startgame_arrow_left.png"></File><File path="startgame_arrow_right.png"></File><File path="tab_bg1.png"></File><File path="tab_bg2.png"></File><File path="tab_bg3.png"></File><File path="tooltip_left.png"></File><File path="tooltip_right.png"></File><File path="tooltip_tile.png"></File><File path="wbackground.png"></File><File path="wdialogue_box_startgame.png"></File><File path="wiimote.png"></File><File path="wiimote_poweroff.png"></File><File path="wiimote_poweroff_over.png"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libwbfs" path="libwbfs\"><File path="libwbfs.c"></File><File path="libwbfs.h"></File><File path="libwbfs_os.h"></File><File path="rijndael.c"></File><File path="wiidisc.c"></File><File path="wiidisc.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libwiigui" path="libwiigui\"><File path="gui.h"></File><File path="gui_button.cpp"></File><File path="gui_customoptionbrowser.cpp"></File><File path="gui_customoptionbrowser.h"></File><File path="gui_diskcover.cpp"></File><File path="gui_diskcover.h"></File><File path="gui_element.cpp"></File><File path="gui_gamebrowser.cpp"></File><File path="gui_gamebrowser.h"></File><File path="gui_image.cpp"></File><File path="gui_imagedata.cpp"></File><File path="gui_keyboard.cpp"></File><File path="gui_optionbrowser.cpp"></File><File path="gui_sound.cpp"></File><File path="gui_text.cpp"></File><File path="gui_tooltip.cpp"></File><File path="gui_trigger.cpp"></File><File path="gui_window.cpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="sounds" path="sounds\"><File path="bg_music.ogg"></File><File path="button_click.pcm"></File><File path="button_click2.pcm"></File><File path="button_over.pcm"></File><File path="credits_music.ogg"></File><File path="menuin.ogg"></File><File path="menuout.ogg"></File></MagicFolder><File path="apploader.c"></File><File path="apploader.h"></File><File path="audio.cpp"></File><File path="audio.h"></File><File path="cfg.c"></File><File path="cfg.h"></File><File path="CH2Unicode.c"></File><File path="CH2Unicode.h"></File><File path="data1"></File><File path="disc.c"></File><File path="disc.h"></File><File path="dns.c"></File><File path="dns.h"></File><File path="dvd_broadway.c"></File><File path="dvd_broadway.h"></File><File path="fatmounter.c"></File><File path="fatmounter.h"></File><File path="filelist.h"></File><File path="FreeTypeGX.cpp"></File><File path="FreeTypeGX.h"></File><File path="fst.c"></File><File path="fst.h"></File><File path="fwrite_patch.h"></File><File path="GB2Unicode.c"></File><File path="GB2Unicode.h"></File><File path="geckomenu.h"></File><File path="http.c"></File><File path="http.h"></File><File path="input.cpp"></File><File path="input.h"></File><File path="kenobiwii.h"></File><File path="language.c"></File><File path="language.h"></File><File path="main.cpp"></File><File path="main.h"></File><File path="menu.cpp"></File><File path="menu.h"></File><File path="mp3s.c"></File><File path="mp3s.h"></File><File path="oggplayer.c"></File><File path="oggplayer.h"></File><File path="partition.c"></File><File path="partition.h"></File><File path="patchcode.c"></File><File path="patchcode.h"></File><File path="patchhook.S"></File><File path="ppc.h"></File><File path="sdhc.c"></File><File path="sdhc.h"></File><File path="stub.S"></File><File path="sys.c"></File><File path="sys.h"></File><File path="usbstorage.c"></File><File path="usbstorage.h"></File><File path="utils.c"></File><File path="utils.h"></File><File path="video.cpp"></File><File path="video.h"></File><File path="video2.c"></File><File path="video2.h"></File><File path="wbfs.c"></File><File path="wbfs.h"></File><File path="wdvd.c"></File><File path="wdvd.h"></File><File path="wpad.c"></File><File path="wpad.h"></File></MagicFolder></Project>
\ No newline at end of file
diff --git a/source/language.c b/source/language.c
index 15edf11a..3e3a0f42 100644
--- a/source/language.c
+++ b/source/language.c
@@ -50,6 +50,7 @@ snprintf(LANGUAGE.Cantbeformated, sizeof(LANGUAGE.Cantbeformated), "Can't be for
 snprintf(LANGUAGE.Cantdelete, sizeof(LANGUAGE.Cantdelete), "Can't delete:");
 snprintf(LANGUAGE.ClicktoDownloadCovers, sizeof(LANGUAGE.ClicktoDownloadCovers), "Click to Download Covers");
 snprintf(LANGUAGE.Clock, sizeof(LANGUAGE.Clock), "Clock");
+snprintf(LANGUAGE.Close, sizeof(LANGUAGE.Close), "Close");
 snprintf(LANGUAGE.Continueinstallgame, sizeof(LANGUAGE.Continueinstallgame), "Continue to install game?");
 snprintf(LANGUAGE.ConsoleDefault, sizeof(LANGUAGE.ConsoleDefault), "Console Default");
 snprintf(LANGUAGE.Consoleshouldbeunlockedtomodifyit, sizeof(LANGUAGE.Consoleshouldbeunlockedtomodifyit), "Console should be unlocked to modify it.");
@@ -78,6 +79,7 @@ snprintf(LANGUAGE.DownloadBoxartimage, sizeof(LANGUAGE.DownloadBoxartimage), "Do
 snprintf(LANGUAGE.Downloadfinished, sizeof(LANGUAGE.Downloadfinished), "Download finished");
 snprintf(LANGUAGE.Error, sizeof(LANGUAGE.Error), "Error !");
 snprintf(LANGUAGE.hour, sizeof(LANGUAGE.hour), "Hour");
+snprintf(LANGUAGE.Homemenu, sizeof(LANGUAGE.Homemenu), "HOME Menu");
 snprintf(LANGUAGE.BOOTERROR, sizeof(LANGUAGE.BOOTERROR), "BOOT ERROR");
 snprintf(LANGUAGE.ErrorreadingDisc, sizeof(LANGUAGE.ErrorreadingDisc), "Error reading Disc");
 snprintf(LANGUAGE.ExitUSBISOLoader, sizeof(LANGUAGE.ExitUSBISOLoader), "Exit USB Loader GX?");
@@ -317,6 +319,10 @@ void language_set(char *name, char *val)
 		strcopy(LANGUAGE.Clock, val, sizeof(LANGUAGE.Clock));
 		return;
 	}
+	if (strcmp(name, "Close") == 0) {
+		strcopy(LANGUAGE.Close, val, sizeof(LANGUAGE.Close));
+		return;
+	}
 	if (strcmp(name, "Continueinstallgame") == 0) {
 		strcopy(LANGUAGE.Continueinstallgame, val, sizeof(LANGUAGE.Continueinstallgame));
 		return;
@@ -581,6 +587,10 @@ void language_set(char *name, char *val)
 		strcopy(LANGUAGE.GotoPage, val, sizeof(LANGUAGE.GotoPage));
 		return;
 	}
+	if (strcmp(name, "Homemenu") == 0) {
+		strcopy(LANGUAGE.Homemenu, val, sizeof(LANGUAGE.Homemenu));
+		return;
+	}
 	if (strcmp(name, "HowtoShutdown") == 0) {
 		strcopy(LANGUAGE.HowtoShutdown, val, sizeof(LANGUAGE.HowtoShutdown));
 		return;
diff --git a/source/language.h b/source/language.h
index aaa4759c..9c46674a 100644
--- a/source/language.h
+++ b/source/language.h
@@ -13,11 +13,11 @@ struct LANGUAGE
 {
 
 	char t3Covers[50];
-	char addToFavorite[20];
-	char all[10];
+	char addToFavorite[50];
+	char all[30];
 	char AppLanguage[50];
 	char Areyousure[50];
-	char AutoPatch[20];
+	char AutoPatch[30];
 	char Back[20];
 	char Backgroundmusic[80];
 	char Backgroundmusicpath[100];
@@ -25,13 +25,14 @@ struct LANGUAGE
 	char BacktoLoader[50];
 	char BacktoWiiMenu[50];
 	char BootStandard[50];
-	char Both[15];
+	char Both[35];
 	char Cantcreatedirectory[50];
 	char Cancel[20];
 	char Cantbeformated[50];
 	char Cantdelete[50];
 	char ClicktoDownloadCovers[50];
 	char Clock[20];
+	char Close[20];
 	char Continueinstallgame[50];
 	char ConsoleDefault[50];
 	char Consoleshouldbeunlockedtomodifyit[100];
@@ -97,13 +98,14 @@ struct LANGUAGE
 	char GoBack[50];
 	char GotoPage[50];///////
 	char HowtoShutdown[50];
-	char hour[10];
+	char Homemenu[30];
+	char hour[30];
 	char keyboard[50];
 	char Language[50];
 	char Langchange[50];
 	char Left[50];
 	char LikeSysMenu[50];
-	char ListSort[20];
+	char ListSort[30];
 	char LoadingincIOS[50];
 	char Loadingstandardlanguage[80];
 	char Loadingstandardmusic[80];
diff --git a/source/libwiigui/gui.h b/source/libwiigui/gui.h
index dae34f19..4deae061 100644
--- a/source/libwiigui/gui.h
+++ b/source/libwiigui/gui.h
@@ -392,6 +392,7 @@ class GuiElement
         //int position2; //! B Scrollbariable
 		bool visible; //!< Visibility of the element. If false, Draw() is skipped
 		int focus; //!< Element focus (-1 = focus disabled, 0 = not focused, 1 = focused)
+		int dontsetfocus; //!<If 0 games dont set the focus
 		int width; //!< Element width
 		int height; //!< Element height
 		int xoffset; //!< Element X offset
diff --git a/source/libwiigui/gui_gamebrowser.cpp b/source/libwiigui/gui_gamebrowser.cpp
index 5e6361b1..172e64c8 100644
--- a/source/libwiigui/gui_gamebrowser.cpp
+++ b/source/libwiigui/gui_gamebrowser.cpp
@@ -26,15 +26,22 @@ GuiGameBrowser::GuiGameBrowser(int w, int h, struct discHdr * l, int gameCnt, co
 {
 	width = w;
 	height = h;
-	if (gameCnt == 0) gameCnt = 1;
+	if (gameCnt == 0) {
+	focus = 0;
+	dontsetfocus = 1;
+	} else {
+    gameList = l;
+	dontsetfocus = 0;
+    focus = 1;
+	}
 	this->gameCnt = gameCnt;
-	gameList = l;
+
 	pagesize = (gameCnt > THEME.pagesize) ? THEME.pagesize : gameCnt;
 	scrollbaron = (gameCnt > THEME.pagesize) ? 1 : 0;
 	selectable = true;
 	listOffset = (offset == 0) ? this->FindMenuItem(-1, 1) : offset;
 	selectedItem = selected - offset;
-	focus = 1; // allow focus
+	 // allow focus
 	char imgPath[100];
 
 	trigA = new GuiTrigger;
@@ -204,6 +211,7 @@ GuiGameBrowser::~GuiGameBrowser()
 void GuiGameBrowser::SetFocus(int f)
 {
 	LOCK(this);
+	if(!dontsetfocus)
 	focus = f;
 
 	for(int i=0; i<pagesize; i++)
@@ -373,7 +381,7 @@ void GuiGameBrowser::Update(GuiTrigger * t)
 			game[i]->SetState(STATE_DISABLED);
 		}
 
-		if(focus)
+		if(focus || !dontsetfocus)
 		{
 			if(i != selectedItem && game[i]->GetState() == STATE_SELECTED)
 				game[i]->ResetState();
@@ -390,7 +398,7 @@ void GuiGameBrowser::Update(GuiTrigger * t)
 	}
 
 	// pad/joystick navigation
-	if(!focus)
+	if(!focus || dontsetfocus)
 		return; // skip navigation
 
     if (scrollbaron == 1) {
@@ -642,10 +650,17 @@ void GuiGameBrowser::Reload(struct discHdr * l, int count)
 	LOCK(this);
 	gameList = l;
 	gameCnt = count;
-	if (gameCnt == 0) gameCnt = 1;
+	if (gameCnt == 0) {
+	focus = 0;
+	dontsetfocus = 1;
+	} else {
+	dontsetfocus = 0;
+    focus = 1;
+    selectedItem = 0;
+	}
+    gameList = l;
 	scrollbaron = (gameCnt > THEME.pagesize) ? 1 : 0;
 	pagesize = (gameCnt > THEME.pagesize) ? THEME.pagesize : gameCnt;
-	selectedItem = 0;
 	listOffset = 0;
 
 	for(int i=0; i<pagesize; i++)
diff --git a/source/menu.cpp b/source/menu.cpp
index 9b4830bf..f80a4639 100644
--- a/source/menu.cpp
+++ b/source/menu.cpp
@@ -759,12 +759,12 @@ WindowExitPrompt(const char *title, const char *msg, const char *btn1Label,
 	GuiTrigger trigHome;
 	trigHome.SetButtonOnlyTrigger(-1, WPAD_BUTTON_HOME | WPAD_CLASSIC_BUTTON_HOME, 0);
 
-	GuiText titleTxt("HOME Menu", 36, (GXColor){255, 255, 255, 255});
+	GuiText titleTxt(LANGUAGE.Homemenu, 36, (GXColor){255, 255, 255, 255});
 	titleTxt.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
 	titleTxt.SetPosition(-180,40);
 	titleTxt.SetEffect(EFFECT_SLIDE_TOP | EFFECT_SLIDE_IN, 50);
 
-	GuiText closeTxt("  Close", 28, (GXColor){0, 0, 0, 255});
+	GuiText closeTxt(LANGUAGE.Close, 28, (GXColor){0, 0, 0, 255});
 	GuiImage closeImg(&close);
 	if (Settings.wsprompt == yes){
 	closeTxt.SetWidescreen(CFG.widescreen);
@@ -772,7 +772,7 @@ WindowExitPrompt(const char *title, const char *msg, const char *btn1Label,
 	GuiButton closeBtn(close.GetWidth(), close.GetHeight());
 	closeBtn.SetImage(&closeImg);
 	closeBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
-	closeBtn.SetPosition(205,42);
+	closeBtn.SetPosition(220,48);
 	closeBtn.SetLabel(&closeTxt);
 	closeBtn.SetRumble(false);
 	closeBtn.SetEffect(EFFECT_SLIDE_TOP | EFFECT_SLIDE_IN, 50);
@@ -1358,7 +1358,7 @@ int GameWindowPrompt()
 				}
 				}
 				////////////end save play count//////////////
-			
+
 				choice = 1;
 				SDCard_deInit();
 			}
@@ -2344,7 +2344,7 @@ s32 __Menu_EntryCmpCount(const void *a, const void *b)
 
 	ret = (s32) (count2-count1);
 	if (ret == 0) return stricmp(get_title(hdr1), get_title(hdr2));
-	
+
 	return ret;
 }
 
@@ -2353,7 +2353,7 @@ s32 __Menu_EntryCmpCount(const void *a, const void *b)
  ***************************************************************************/
 
 s32 __Menu_GetEntries(void)
-{	
+{
 	struct discHdr *buffer = NULL;
 	struct discHdr *buffer2 = NULL;
 	struct discHdr *header = NULL;
@@ -2383,7 +2383,7 @@ s32 __Menu_GetEntries(void)
 		if(buffer) free(buffer);
 		return ret;
 	}
-		
+
 	/* Filters */
 	if (Settings.sort==fave || dispFave) {
 		u32 cnt2 = 0;
@@ -2412,7 +2412,7 @@ s32 __Menu_GetEntries(void)
 		buffer = buffer2;
 		buffer2 = NULL;
 		cnt = cnt2;
-	}	
+	}
 
 	if (CFG.parentalcontrol && !CFG.godmode)
 	{
@@ -2585,61 +2585,9 @@ static int MenuInstall()
 	snprintf(imgPath, sizeof(imgPath), "%sbattery_bar.png", CFG.theme_path);
 	GuiImageData batteryBar(imgPath, battery_bar_png);
 
-	#ifdef HW_RVL
-	int i = 0, level;
-	char txt[3];
-	GuiText * batteryTxt[4];
-	GuiImage * batteryImg[4];
-	GuiImage * batteryBarImg[4];
-	GuiButton * batteryBtn[4];
-
-	for(i=0; i < 4; i++)
-	{
-
-		if(i == 0)
-			sprintf(txt, "P%d", i+1);
-		else
-			sprintf(txt, "P%d", i+1);
-
-		batteryTxt[i] = new GuiText(txt, 22, (GXColor){THEME.info_r, THEME.info_g, THEME.info_b, 255});
-		batteryTxt[i]->SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE);
-		batteryImg[i] = new GuiImage(&battery);
-		batteryImg[i]->SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE);
-		batteryImg[i]->SetPosition(36, 0);
-		batteryImg[i]->SetTile(0);
-		batteryBarImg[i] = new GuiImage(&batteryBar);
-		batteryBarImg[i]->SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE);
-		batteryBarImg[i]->SetPosition(33, 0);
-
-		batteryBtn[i] = new GuiButton(40, 20);
-		batteryBtn[i]->SetLabel(batteryTxt[i]);
-		batteryBtn[i]->SetImage(batteryBarImg[i]);
-		batteryBtn[i]->SetIcon(batteryImg[i]);
-		batteryBtn[i]->SetAlignment(ALIGN_LEFT, ALIGN_TOP);
-		batteryBtn[i]->SetRumble(false);
-		batteryBtn[i]->SetAlpha(70);
-	}
-
-
-	batteryBtn[0]->SetPosition(THEME.battery1_x, THEME.battery1_y);
-	batteryBtn[1]->SetPosition(THEME.battery2_x, THEME.battery2_y);
-	batteryBtn[2]->SetPosition(THEME.battery3_x, THEME.battery3_y);
-	batteryBtn[3]->SetPosition(THEME.battery4_x, THEME.battery4_y);
-	#endif
-
     HaltGui();
 	GuiWindow w(screenwidth, screenheight);
 
-	if (THEME.showBattery)
-	{
-		#ifdef HW_RVL
-		w.Append(batteryBtn[0]);
-		w.Append(batteryBtn[1]);
-		w.Append(batteryBtn[2]);
-		w.Append(batteryBtn[3]);
-		#endif
-	}
-
     mainWindow->Append(&w);
 
 	ResumeGui();
@@ -2648,31 +2596,6 @@ static int MenuInstall()
 	{
 	    VIDEO_WaitVSync ();
 
-		#ifdef HW_RVL
-		for(i=0; i < 4; i++)
-		{
-			if(WPAD_Probe(i, NULL) == WPAD_ERR_NONE) // controller connected
-			{
-				level = (userInput[i].wpad.battery_level / 100.0) * 4;
-				if(level > 4) level = 4;
-				batteryImg[i]->SetTile(level);
-
-				if(level == 0)
-					batteryBarImg[i]->SetImage(&batteryRed);
-				else
-					batteryBarImg[i]->SetImage(&batteryBar);
-
-				batteryBtn[i]->SetAlpha(255);
-			}
-			else // controller not connected
-			{
-				batteryImg[i]->SetTile(0);
-				batteryImg[i]->SetImage(&battery);
-				batteryBtn[i]->SetAlpha(70);
-			}
-		}
-		#endif
-
 		ret = DiscWait(LANGUAGE.InsertDisk,LANGUAGE.Waiting,LANGUAGE.Cancel,0,0);
 		if (ret < 0) {
 			WindowPrompt (LANGUAGE.ErrorreadingDisc,0,LANGUAGE.Back,0,0,0);
@@ -2792,16 +2715,6 @@ static int MenuInstall()
 
 	HaltGui();
 
-	#ifdef HW_RVL
-	for(i=0; i < 4; i++)
-	{
-		delete batteryTxt[i];
-		delete batteryImg[i];
-		delete batteryBarImg[i];
-		delete batteryBtn[i];
-	}
-	#endif
-
 	mainWindow->Remove(&w);
 	ResumeGui();
 	return menu;