added language definitions for some new update windows. added 2 new constructors for buttons so is takes 1 line of code to make a button and not 7. switched most of menu.cpp to the new buttons. remove the "exit to loader" btn if not launched from HBC.

source/language.c

@@ -35,6 +35,7 @@ snprintf(LANGUAGE.all, sizeof(LANGUAGE.all), "Alphabetical");
 snprintf(LANGUAGE.AppLanguage, sizeof(LANGUAGE.AppLanguage), "App Language");
 snprintf(LANGUAGE.t3Covers, sizeof(LANGUAGE.t3Covers), "3D Covers");
 snprintf(LANGUAGE.Areyousure, sizeof(LANGUAGE.Areyousure), "Are you sure?");
+snprintf(LANGUAGE.available, sizeof(LANGUAGE.available), "available");
 snprintf(LANGUAGE.AutoPatch, sizeof(LANGUAGE.AutoPatch), "AutoPatch");
 snprintf(LANGUAGE.Back, sizeof(LANGUAGE.Back), "Back");
 snprintf(LANGUAGE.Backgroundmusic, sizeof(LANGUAGE.Backgroundmusic), "Backgroundmusic");
@@ -47,6 +48,7 @@ snprintf(LANGUAGE.Both, sizeof(LANGUAGE.Both), "Both");
 snprintf(LANGUAGE.Cantcreatedirectory, sizeof(LANGUAGE.Cantcreatedirectory), "Can't create directory");
 snprintf(LANGUAGE.Cancel, sizeof(LANGUAGE.Cancel), "Cancel");
 snprintf(LANGUAGE.Cantbeformated, sizeof(LANGUAGE.Cantbeformated), "Can't be formated");
+snprintf(LANGUAGE.CheckingforUpdates, sizeof(LANGUAGE.CheckingforUpdates), "Checking for Updates");
 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");
@@ -74,6 +76,7 @@ snprintf(LANGUAGE.Display, sizeof(LANGUAGE.Display), "Display");
 snprintf(LANGUAGE.Doyouwanttoformat, sizeof(LANGUAGE.Doyouwanttoformat), "Do you want to format:");
 snprintf(LANGUAGE.Doyoureallywanttodelete, sizeof(LANGUAGE.Doyoureallywanttodelete), "Do you really want to delete:");
 snprintf(LANGUAGE.Doyouwanttoretryfor30secs, sizeof(LANGUAGE.Doyouwanttoretryfor30secs), "Do you want to retry for 30 secs?");
+snprintf(LANGUAGE.Doyouwanttoupdate, sizeof(LANGUAGE.Doyouwanttoupdate), "Do you want to update");
 snprintf(LANGUAGE.Downloadingfile, sizeof(LANGUAGE.Downloadingfile), "Downloading file");
 snprintf(LANGUAGE.DownloadBoxartimage, sizeof(LANGUAGE.DownloadBoxartimage), "Download Boxart image?");
 snprintf(LANGUAGE.Downloadfinished, sizeof(LANGUAGE.Downloadfinished), "Download finished");
@@ -134,6 +137,7 @@ snprintf(LANGUAGE.Missingfiles, sizeof(LANGUAGE.Missingfiles), "Missing files");
 snprintf(LANGUAGE.Networkiniterror, sizeof(LANGUAGE.Networkiniterror), "Network init error");
 snprintf(LANGUAGE.Neither, sizeof(LANGUAGE.Neither), "Neither");
 snprintf(LANGUAGE.Next, sizeof(LANGUAGE.Next), "Next");
+snprintf(LANGUAGE.Nonewupdates, sizeof(LANGUAGE.Nonewupdates), "No new updates.");
 snprintf(LANGUAGE.No, sizeof(LANGUAGE.No), "No");
 snprintf(LANGUAGE.Nofilemissing, sizeof(LANGUAGE.Nofilemissing), "No file missing!");
 snprintf(LANGUAGE.NoHDDfound, sizeof(LANGUAGE.NoHDDfound), "No HDD found!");
@@ -166,6 +170,7 @@ snprintf(LANGUAGE.PromptsButtons, sizeof(LANGUAGE.PromptsButtons), "Prompts Butt
 snprintf(LANGUAGE.ReloadSD, sizeof(LANGUAGE.ReloadSD), "Reload SD");
 snprintf(LANGUAGE.RenameGameonWBFS, sizeof(LANGUAGE.RenameGameonWBFS), "Rename Game on WBFS");
 snprintf(LANGUAGE.Restart, sizeof(LANGUAGE.Restart), "Restart");
+snprintf(LANGUAGE.Restarting, sizeof(LANGUAGE.Restarting), "Restarting...");
 snprintf(LANGUAGE.Return, sizeof(LANGUAGE.Return), "Return");
 snprintf(LANGUAGE.ReturntoWiiMenu, sizeof(LANGUAGE.ReturntoWiiMenu), "Return to Wii Menu");
 snprintf(LANGUAGE.Right, sizeof(LANGUAGE.Right), "Right");
@@ -187,6 +192,7 @@ snprintf(LANGUAGE.ShutdowntoIdle, sizeof(LANGUAGE.ShutdowntoIdle), "Shutdown to
 snprintf(LANGUAGE.ShutdownSystem, sizeof(LANGUAGE.ShutdownSystem), "Shutdown System");
 snprintf(LANGUAGE.Success, sizeof(LANGUAGE.Success), "Success:");
 snprintf(LANGUAGE.Successfullyinstalled, sizeof(LANGUAGE.Successfullyinstalled), "Successfully installed:");
+snprintf(LANGUAGE.Successfullyupdated, sizeof(LANGUAGE.Successfullyupdated), "Successfully Updated");
 snprintf(LANGUAGE.Successfullydeleted, sizeof(LANGUAGE.Successfullydeleted), "Successfully deleted:");
 snprintf(LANGUAGE.SuccessfullySaved, sizeof(LANGUAGE.SuccessfullySaved), "Successfully Saved");
 snprintf(LANGUAGE.SystemDefault, sizeof(LANGUAGE.SystemDefault), "System Default");
@@ -199,6 +205,7 @@ snprintf(LANGUAGE.TitlestxtpathChanged, sizeof(LANGUAGE.TitlestxtpathChanged), "
 snprintf(LANGUAGE.Try, sizeof(LANGUAGE.Try), "Try");
 snprintf(LANGUAGE.Tooltips, sizeof(LANGUAGE.Tooltips), "Tooltips");
 snprintf(LANGUAGE.Timeleft, sizeof(LANGUAGE.Timeleft), "Time left:");
+snprintf(LANGUAGE.updating, sizeof(LANGUAGE.updating), "Updating");
 snprintf(LANGUAGE.Unlock, sizeof(LANGUAGE.Unlock), "Unlock");
 snprintf(LANGUAGE.Unicodefix, sizeof(LANGUAGE.Unicodefix), "Unicode Fix");
 snprintf(LANGUAGE.Uninstall, sizeof(LANGUAGE.Uninstall), "Uninstall");
@@ -1043,6 +1050,31 @@ void language_set(char *name, char *val)
 		strcopy(LANGUAGE.Korean, val, sizeof(LANGUAGE.Korean));
 		return;
 	}
+	if (strcmp(name, "Successfullyupdated") == 0) {
+		strcopy(LANGUAGE.Successfullyupdated, val, sizeof(LANGUAGE.Successfullyupdated));
+		return;
+	}
+	if (strcmp(name, "Nonewupdates") == 0) {
+		strcopy(LANGUAGE.Nonewupdates, val, sizeof(LANGUAGE.Nonewupdates));
+		return;
+	}
+	if (strcmp(name, "Restarting") == 0) {
+		strcopy(LANGUAGE.Restarting, val, sizeof(LANGUAGE.Restarting));
+		return;
+	}
+	if (strcmp(name, "available") == 0) {
+		strcopy(LANGUAGE.available, val, sizeof(LANGUAGE.available));
+		return;
+	}
+	if (strcmp(name, "Doyouwanttoupdate") == 0) {
+		strcopy(LANGUAGE.Doyouwanttoupdate, val, sizeof(LANGUAGE.Doyouwanttoupdate));
+		return;
+	}
+	if (strcmp(name, "updating") == 0) {
+		strcopy(LANGUAGE.updating, val, sizeof(LANGUAGE.updating));
+		return;
+	}
+	
 
 }
 

source/language.h

@@ -16,6 +16,7 @@ struct LANGUAGE
 	char addToFavorite[50];
 	char all[30];
 	char AppLanguage[50];
+	char available[20];
 	char Areyousure[50];
 	char AutoPatch[30];
 	char Back[20];
@@ -30,6 +31,7 @@ struct LANGUAGE
 	char Cancel[20];
 	char Cantbeformated[50];
 	char Cantdelete[50];
+	char CheckingforUpdates[40];
 	char ClicktoDownloadCovers[50];
 	char Clock[20];
 	char Close[20];
@@ -56,6 +58,7 @@ struct LANGUAGE
 	char Doyouwanttoformat[50];
 	char Doyoureallywanttodelete[50];
 	char Doyouwanttoretryfor30secs[80];
+	char Doyouwanttoupdate[50];
 	char Downloadingfile[50];
 	char DownloadBoxartimage[50];
 	char Downloadfinished[50];
@@ -125,6 +128,7 @@ struct LANGUAGE
 	char Nopartitionsfound[50];
 	char NoUSBDevice[40];
 	char NoWBFSpartitionfound[50];
+	char Nonewupdates[40];
 	char NormalCovers[40];
 	char Normal[30];
 	char NotaWiiDisc[40];
@@ -151,6 +155,7 @@ struct LANGUAGE
 	char ReloadSD[50];
 	char RenameGameonWBFS[50];
 	char Restart[30];
+	char Restarting[20];
 	char Return[30];
 	char ReturntoWiiMenu[50];
 	char Right[30];
@@ -171,6 +176,7 @@ struct LANGUAGE
 	char ShutdownSystem[50];
 	char Success[30];
 	char Successfullyinstalled[80];
+	char Successfullyupdated[70];
 	char Successfullydeleted[60];
 	char SuccessfullySaved[50];
 	char SystemDefault[50];
@@ -188,6 +194,7 @@ struct LANGUAGE
 	char Uninstall[50];
 	char USBLoaderisprotected[80];
 	char USBDevicenotfound[80];
+	char updating[25];
 	char Updatepath[50];
 	char Updatepathchanged[50];
 	char Updatefailed[40];

source/libwiigui/gui.h

@@ -751,6 +751,8 @@ class GuiButton : public GuiElement
 		//!\param w Width
 		//!\param h Height
 		GuiButton(int w, int h);
+		GuiButton(GuiImage* img, GuiImage* imgOver, int hor, int vert, int x, int y, GuiTrigger* trig, GuiSound* sndOver, GuiSound* sndClick, u8 grow);
+		GuiButton(GuiImage* img, GuiImage* imgOver, int hor, int vert, int x, int y, GuiTrigger* trig, GuiSound* sndOver, GuiSound* sndClick, u8 grow, GuiTooltip* tt, int ttx, int tty, int h_align, int v_align);
 		//!Destructor
 		~GuiButton();
 		//!Sets the button's image

source/libwiigui/gui_button.cpp

@@ -46,6 +46,107 @@ GuiButton::GuiButton(int w, int h)
 	clickable = true;
 }
 
+GuiButton::GuiButton(GuiImage* img, GuiImage* imgOver, int hor, int vert, int x, int y, GuiTrigger* trig, GuiSound* sndOver, GuiSound* sndClick, u8 grow)
+{
+	width = img->GetWidth();
+	height = img->GetHeight();
+	image = img;
+	image->SetParent(this);
+	imageOver = imgOver;
+	imageOver->SetParent(this);
+	imageHold = NULL;
+	imageClick = NULL;
+	icon = NULL;
+	iconOver = NULL;
+	iconHold = NULL;
+	iconClick = NULL;
+	toolTip = NULL;
+	alignmentHor = hor;
+	alignmentVert = vert;
+	xoffset = x;
+	yoffset = y;
+	trigger[0] = trig;
+	
+	//SetAlignment(h_align, v_align);
+	//SetPosition(x,y);
+
+	
+
+	for(int i=0; i < 3; i++)
+	{
+		label[i] = NULL;
+		labelOver[i] = NULL;
+		labelHold[i] = NULL;
+		labelClick[i] = NULL;
+	}
+
+	soundOver = sndOver;
+	soundHold = NULL;
+	soundClick = sndClick;
+	selectable = true;
+	holdable = false;
+	clickable = true;
+	
+	if (grow==1){
+	effectsOver |= EFFECT_SCALE;
+	effectAmountOver = 4;
+	effectTargetOver = 110;
+	}
+}
+
+GuiButton::GuiButton(GuiImage* img, GuiImage* imgOver, int hor, int vert, int x, int y, GuiTrigger* trig, GuiSound* sndOver, GuiSound* sndClick, u8 grow, GuiTooltip* tt, int ttx, int tty, int h_align, int v_align)
+{
+	width = img->GetWidth();
+	height = img->GetHeight();
+	image = img;
+	image->SetParent(this);
+	imageOver = imgOver;
+	imageOver->SetParent(this);
+	imageHold = NULL;
+	imageClick = NULL;
+	icon = NULL;
+	iconOver = NULL;
+	iconHold = NULL;
+	iconClick = NULL;
+	toolTip = NULL;
+	alignmentHor = hor;
+	alignmentVert = vert;
+	xoffset = x;
+	yoffset = y;
+	trigger[0] = trig;
+	
+	//SetAlignment(h_align, v_align);
+	//SetPosition(x,y);
+
+	
+
+	for(int i=0; i < 3; i++)
+	{
+		label[i] = NULL;
+		labelOver[i] = NULL;
+		labelHold[i] = NULL;
+		labelClick[i] = NULL;
+	}
+
+	soundOver = sndOver;
+	soundHold = NULL;
+	soundClick = sndClick;
+	selectable = true;
+	holdable = false;
+	clickable = true;
+	
+	if (grow==1){
+	effectsOver |= EFFECT_SCALE;
+	effectAmountOver = 4;
+	effectTargetOver = 110;
+	}
+	
+	toolTip = tt;
+	toolTip->SetParent(this);
+	toolTip->SetAlignment(h_align, v_align);
+	toolTip->SetPosition(ttx,tty);
+}
+
 /**
  * Destructor for the GuiButton class.
  */

source/menu.cpp

@@ -437,14 +437,10 @@ WindowPrompt(const char *title, const char *msg, const char *btn1Label,
 	btn1Txt.SetWidescreen(CFG.widescreen);
 	btn1Img.SetWidescreen(CFG.widescreen);
 	}
-	GuiButton btn1(btnOutline.GetWidth(), btnOutline.GetHeight());
+	
+	GuiButton btn1(&btn1Img, &btn1Img, 0,3,0,0,&trigA,&btnSoundOver,&btnClick,1);
 	btn1.SetLabel(&btn1Txt);
-	btn1.SetImage(&btn1Img);
-	btn1.SetSoundOver(&btnSoundOver);
-	btn1.SetSoundClick(&btnClick);
-	btn1.SetTrigger(&trigA);
 	btn1.SetState(STATE_SELECTED);
-	btn1.SetEffectGrow();
 
 	GuiText btn2Txt(btn2Label, 22, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{0, 0, 0, 255});
 	GuiImage btn2Img(&btnOutline);
@@ -452,15 +448,10 @@ WindowPrompt(const char *title, const char *msg, const char *btn1Label,
 	btn2Txt.SetWidescreen(CFG.widescreen);
 	btn2Img.SetWidescreen(CFG.widescreen);
 	}
-	GuiButton btn2(btnOutline.GetWidth(), btnOutline.GetHeight());
+	GuiButton btn2(&btn2Img, &btn2Img, 0,3,0,0,&trigA,&btnSoundOver,&btnClick,1);
 	btn2.SetLabel(&btn2Txt);
-	btn2.SetImage(&btn2Img);
-	btn2.SetSoundOver(&btnSoundOver);
-	btn2.SetSoundClick(&btnClick);
 	if(!btn3Label && !btn4Label)
 	btn2.SetTrigger(&trigB);
-	btn2.SetTrigger(&trigA);
-	btn2.SetEffectGrow();
 
     GuiText btn3Txt(btn3Label, 22, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{0, 0, 0, 255});
 	GuiImage btn3Img(&btnOutline);
@@ -468,15 +459,10 @@ WindowPrompt(const char *title, const char *msg, const char *btn1Label,
 	btn3Txt.SetWidescreen(CFG.widescreen);
 	btn3Img.SetWidescreen(CFG.widescreen);
 	}
-	GuiButton btn3(btnOutline.GetWidth(), btnOutline.GetHeight());
+	GuiButton btn3(&btn3Img, &btn3Img, 0,3,0,0,&trigA,&btnSoundOver,&btnClick,1);
 	btn3.SetLabel(&btn3Txt);
-	btn3.SetImage(&btn3Img);
-	btn3.SetSoundOver(&btnSoundOver);
-	btn3.SetSoundClick(&btnClick);
 	if(!btn4Label)
 	btn3.SetTrigger(&trigB);
-	btn3.SetTrigger(&trigA);
-	btn3.SetEffectGrow();
 
     GuiText btn4Txt(btn4Label, 22, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{0, 0, 0, 255});
 	GuiImage btn4Img(&btnOutline);
@@ -484,22 +470,13 @@ WindowPrompt(const char *title, const char *msg, const char *btn1Label,
 	btn4Txt.SetWidescreen(CFG.widescreen);
 	btn4Img.SetWidescreen(CFG.widescreen);
 	}
-	GuiButton btn4(btnOutline.GetWidth(), btnOutline.GetHeight());
+	GuiButton btn4(&btn4Img, &btn4Img, 0,3,0,0,&trigA,&btnSoundOver,&btnClick,1);
 	btn4.SetLabel(&btn4Txt);
-	btn4.SetImage(&btn4Img);
-	btn4.SetSoundOver(&btnSoundOver);
-	btn4.SetSoundClick(&btnClick);
 	if(btn4Label)
 	btn4.SetTrigger(&trigB);
-	btn4.SetTrigger(&trigA);
-	btn4.SetEffectGrow();
 
 	if ((Settings.wsprompt == yes) && (CFG.widescreen)){/////////////adjust buttons for widescreen
 		msgTxt.SetMaxWidth(330);
-//        btn1Txt.SetFontSize(20);
-//		btn2Txt.SetFontSize(20);
-//		btn3Txt.SetFontSize(20);
-//		btn4Txt.SetFontSize(20);
 
 		if(btn2Label && !btn3Label && !btn4Label)
         {
@@ -686,6 +663,7 @@ WindowExitPrompt(const char *title, const char *msg, const char *btn1Label,
 
     int choice = -1;
 	char imgPath[100];
+	u8 HBC=0;
 	GuiWindow promptWindow(640,480);
 	promptWindow.SetAlignment(ALIGN_LEFT, ALIGN_TOP);
 	promptWindow.SetPosition(0, 0);
@@ -747,6 +725,19 @@ WindowExitPrompt(const char *title, const char *msg, const char *btn1Label,
 	batteryBtn[1]->SetPosition(284, 150);
 	batteryBtn[2]->SetPosition(388, 150);
 	batteryBtn[3]->SetPosition(494, 150);
+	
+	       
+    char * sig = (char *)0x80001804;
+    if(
+        sig[0] == 'S' &&
+        sig[1] == 'T' &&
+        sig[2] == 'U' &&
+        sig[3] == 'B' &&
+        sig[4] == 'H' &&
+        sig[5] == 'A' &&
+        sig[6] == 'X' &&
+        sig[7] == 'X')
+        HBC=1; // Exit to HBC
     #endif
 
     GuiTrigger trigA;
@@ -778,14 +769,8 @@ WindowExitPrompt(const char *title, const char *msg, const char *btn1Label,
 
 	GuiImage btn1Img(&top);
 	GuiImage btn1OverImg(&topOver);
-	GuiButton btn1(top.GetWidth(), top.GetHeight());
+	GuiButton btn1(&btn1Img,&btn1OverImg, 0, 3, 0, 0, &trigA, &btnSoundOver, &btnClick,0);
-	btn1.SetImage(&btn1Img);
-	btn1.SetImageOver(&btn1OverImg);
-	btn1.SetSoundOver(&btnSoundOver);
-	btn1.SetTrigger(&trigA);
-	btn1.SetAlignment(ALIGN_LEFT, ALIGN_TOP);
 	btn1.SetEffect(EFFECT_SLIDE_TOP | EFFECT_SLIDE_IN, 50);
-    btn1.SetPosition(0, 0);
 
 	GuiText btn2Txt(btn1Label, 28, (GXColor){0, 0, 0, 255});
 	GuiImage btn2Img(&button);
@@ -793,17 +778,11 @@ WindowExitPrompt(const char *title, const char *msg, const char *btn1Label,
 	btn2Txt.SetWidescreen(CFG.widescreen);
 	btn2Img.SetWidescreen(CFG.widescreen);
 	}
-	GuiButton btn2(button.GetWidth(), button.GetHeight());
+	GuiButton btn2(&btn2Img,&btn2Img, 2, 5, -150, 0, &trigA, &btnSoundOver, &btnClick,1);
 	btn2.SetLabel(&btn2Txt);
-	btn2.SetImage(&btn2Img);
-	btn2.SetSoundOver(&btnSoundOver);
-	btn2.SetSoundClick(&btnClick);
-	btn2.SetTrigger(&trigA);
-	btn2.SetEffectGrow();
-	btn2.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE);
-    btn2.SetPosition(-150, 0);
 	btn2.SetEffect(EFFECT_SLIDE_LEFT | EFFECT_SLIDE_IN, 50);
 	btn2.SetRumble(false);
+	if (HBC==1){btn2.SetPosition(-150, 0);}
 
     GuiText btn3Txt(btn2Label, 28, (GXColor){0, 0, 0, 255});
 	GuiImage btn3Img(&button);
@@ -811,29 +790,18 @@ WindowExitPrompt(const char *title, const char *msg, const char *btn1Label,
 	btn3Txt.SetWidescreen(CFG.widescreen);
 	btn3Img.SetWidescreen(CFG.widescreen);
 	}
-	GuiButton btn3(button.GetWidth(), button.GetHeight());
+	GuiButton btn3(&btn3Img,&btn3Img, 2, 5, 150, 0, &trigA, &btnSoundOver, &btnClick,1);
 	btn3.SetLabel(&btn3Txt);
-	btn3.SetImage(&btn3Img);
-	btn3.SetSoundOver(&btnSoundOver);
-	btn3.SetSoundClick(&btnClick);
-	btn3.SetTrigger(&trigA);
-	btn3.SetEffectGrow();
-	btn3.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE);
-    btn3.SetPosition(150, 0);
 	btn3.SetEffect(EFFECT_SLIDE_RIGHT | EFFECT_SLIDE_IN, 50);
 	btn3.SetRumble(false);
+	if (HBC==1){btn3.SetPosition(150, 0);}
+	else {btn3.SetPosition(0,0);}
 
 	GuiImage btn4Img(&bottom);
 	GuiImage btn4OverImg(&bottomOver);
-	GuiButton btn4(bottom.GetWidth(), bottom.GetHeight());
+	GuiButton btn4(&btn4Img,&btn4OverImg, 0, 4, 0, 0, &trigA, &btnSoundOver, &btnClick,0);
-	btn4.SetImage(&btn4Img);
-	btn4.SetImageOver(&btn4OverImg);
-	btn4.SetSoundOver(&btnSoundOver);
-	btn4.SetTrigger(&trigA);
 	btn4.SetTrigger(&trigB);
 	btn4.SetTrigger(&trigHome);
-	btn4.SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM);
-    btn4.SetPosition(0,0);
 	btn4.SetEffect(EFFECT_SLIDE_BOTTOM | EFFECT_SLIDE_IN, 50);
 
 	GuiImage wiimoteImg(&wiimote);
@@ -842,7 +810,7 @@ WindowExitPrompt(const char *title, const char *msg, const char *btn1Label,
 	wiimoteImg.SetEffect(EFFECT_SLIDE_BOTTOM | EFFECT_SLIDE_IN, 50);
 	wiimoteImg.SetPosition(50,210);
 
-	promptWindow.Append(&btn2);
+	if (HBC==1){promptWindow.Append(&btn2);}
     promptWindow.Append(&btn3);
     promptWindow.Append(&btn4);
     promptWindow.Append(&btn1);
@@ -1084,7 +1052,6 @@ int GameWindowPrompt()
 	btn1.SetSoundClick(&btnClick);
 	btn1.SetTrigger(&trigA);
 	btn1.SetState(STATE_SELECTED);
-	//btn1.SetEffectGrow(); just commented it out if anybody wants to use it again.
 
 	GuiText btn2Txt(LANGUAGE.Back, 22, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{0, 0, 0, 255});
 	GuiImage btn2Img(&btnOutline);
@@ -1092,8 +1059,7 @@ int GameWindowPrompt()
 	btn2Txt.SetWidescreen(CFG.widescreen);
 	btn2Img.SetWidescreen(CFG.widescreen);
 	}
-	GuiButton btn2(btnOutline.GetWidth(), btnOutline.GetHeight());
+	GuiButton btn2(&btn2Img,&btn2Img, 1, 5, 0, 0, &trigA, &btnSoundOver, &btnClick,1);
-	//check if unlocked
 	if (CFG.godmode == 1)
 	{
 		btn2.SetAlignment(ALIGN_RIGHT, ALIGN_BOTTOM);
@@ -1106,74 +1072,42 @@ int GameWindowPrompt()
 	}
 
 	btn2.SetLabel(&btn2Txt);
-	btn2.SetImage(&btn2Img);
-	btn2.SetSoundOver(&btnSoundOver);
-	btn2.SetSoundClick(&btnClick);
 	btn2.SetTrigger(&trigB);
-	btn2.SetTrigger(&trigA);
-	btn2.SetEffectGrow();
 	
 	GuiText btn3Txt(LANGUAGE.settings, 22, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{0, 0, 0, 255});
 	GuiImage btn3Img(&btnOutline);
 	if (Settings.wsprompt == yes){
 	btn3Txt.SetWidescreen(CFG.widescreen);
 	btn3Img.SetWidescreen(CFG.widescreen);}
-	GuiButton btn3(btnOutline.GetWidth(), btnOutline.GetHeight());
+	GuiButton btn3(&btn3Img,&btn3Img, 0, 4, 50, -40, &trigA, &btnSoundOver, &btnClick,1);
-	btn3.SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM);
-	btn3.SetPosition(50, -40);
 	btn3.SetLabel(&btn3Txt);
-	btn3.SetImage(&btn3Img);
-	btn3.SetSoundOver(&btnSoundOver);
-	btn3.SetSoundClick(&btnClick);
-	btn3.SetTrigger(&trigA);
-	btn3.SetEffectGrow();
 	
 	GuiImage btnFavoriteImg;
 	btnFavoriteImg.SetWidescreen(CFG.widescreen);
-	GuiButton btnFavorite(imgFavorite.GetWidth(), imgFavorite.GetHeight());
+	GuiButton btnFavorite(&btnFavoriteImg,&btnFavoriteImg, 2, 5, -125, -60, &trigA, &btnSoundOver, &btnClick,1);
-	btnFavorite.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE);
-	btnFavorite.SetPosition(-125, -60);
-	btnFavorite.SetImage(&btnFavoriteImg);
-	btnFavorite.SetSoundOver(&btnSoundOver);
-	btnFavorite.SetSoundClick(&btnClick);
-	btnFavorite.SetTrigger(&trigA);
-	btnFavorite.SetEffectGrow();
 	
 	GuiImage btnLeftImg(&imgLeft);
 	if (Settings.wsprompt == yes)
 		{
 			btnLeftImg.SetWidescreen(CFG.widescreen);
 		}
-	GuiButton btnLeft(imgLeft.GetWidth(), imgLeft.GetHeight());
+	GuiButton btnLeft(&btnLeftImg,&btnLeftImg, 0, 5, 20, 0, &trigA, &btnSoundOver, &btnClick,1);
-	btnLeft.SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE);
-	btnLeft.SetPosition(20, 0);
-	btnLeft.SetImage(&btnLeftImg);
-	btnLeft.SetSoundOver(&btnSoundOver);
-	btnLeft.SetTrigger(&trigA);
 	btnLeft.SetTrigger(&trigL);
 	btnLeft.SetTrigger(&trigMinus);
-	btnLeft.SetEffectGrow();
 	
 	GuiImage btnRightImg(&imgRight);
 	if (Settings.wsprompt == yes)
 		{
 			btnRightImg.SetWidescreen(CFG.widescreen);
 		}
-	GuiButton btnRight(imgRight.GetWidth(), imgRight.GetHeight());
+	GuiButton btnRight(&btnRightImg,&btnRightImg, 1, 5, -20, 0, &trigA, &btnSoundOver, &btnClick,1);
-	btnRight.SetAlignment(ALIGN_RIGHT, ALIGN_MIDDLE);
-	btnRight.SetPosition(-20, 0);
-	btnRight.SetImage(&btnRightImg);
-	btnRight.SetSoundOver(&btnSoundOver);
-	btnRight.SetTrigger(&trigA);
 	btnRight.SetTrigger(&trigR);
 	btnRight.SetTrigger(&trigPlus);
-	btnRight.SetEffectGrow();
 	
 	promptWindow.Append(&dialogBoxImg);
 	promptWindow.Append(&nameBtn);
 	promptWindow.Append(&sizeTxt);
 	promptWindow.Append(&playcntTxt);
-//	promptWindow.Append(&btn1); // move down at last apended
 	promptWindow.Append(&btn2);
 	promptWindow.Append(&btnLeft);
 	promptWindow.Append(&btnRight);
@@ -1539,7 +1473,7 @@ DiscWait(const char *title, const char *msg, const char *btn1Label, const char *
 	btn1Txt.SetWidescreen(CFG.widescreen);
 	btn1Img.SetWidescreen(CFG.widescreen);
 	}
-	GuiButton btn1(btnOutline.GetWidth(), btnOutline.GetHeight());
+	GuiButton btn1(&btn1Img,&btn1Img, 1, 5, 0, 0, &trigA, &btnSoundOver, &btnClick,1);
 	
 	if(btn2Label)
 	{
@@ -1553,13 +1487,8 @@ DiscWait(const char *title, const char *msg, const char *btn1Label, const char *
 	}
 
 	btn1.SetLabel(&btn1Txt);
-	btn1.SetImage(&btn1Img);
-	btn1.SetSoundOver(&btnSoundOver);
-	btn1.SetSoundClick(&btnClick);
 	btn1.SetTrigger(&trigB);
-	btn1.SetTrigger(&trigA);
 	btn1.SetState(STATE_SELECTED);
-	btn1.SetEffectGrow();
 	
 	GuiText btn2Txt(btn2Label, 22, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{0, 0, 0, 255});
 	GuiImage btn2Img(&btnOutline);
@@ -1567,15 +1496,8 @@ DiscWait(const char *title, const char *msg, const char *btn1Label, const char *
 	btn2Txt.SetWidescreen(CFG.widescreen);
 	btn2Img.SetWidescreen(CFG.widescreen);
 	}
-	GuiButton btn2(btnOutline.GetWidth(), btnOutline.GetHeight());
+	GuiButton btn2(&btn2Img,&btn2Img, 1, 4, -20, -25, &trigA, &btnSoundOver, &btnClick,1);
-	btn2.SetAlignment(ALIGN_RIGHT, ALIGN_BOTTOM);
-	btn2.SetPosition(-20, -25);
 	btn2.SetLabel(&btn2Txt);
-	btn2.SetImage(&btn2Img);
-	btn2.SetSoundOver(&btnSoundOver);
-	btn2.SetSoundClick(&btnClick);
-	btn2.SetTrigger(&trigA);
-	btn2.SetEffectGrow();
 	
 	if ((Settings.wsprompt == yes) && (CFG.widescreen)){/////////////adjust buttons for widescreen
 		msgTxt.SetMaxWidth(380);
@@ -1757,16 +1679,9 @@ int NetworkInitPromp(int choice2)
 	btn1Txt.SetWidescreen(CFG.widescreen);
 	btn1Img.SetWidescreen(CFG.widescreen);
 	}
-	GuiButton btn1(btnOutline.GetWidth(), btnOutline.GetHeight());
+	GuiButton btn1(&btn1Img,&btn1Img, 2, 4, 0, -45, &trigA, &btnSoundOver, &btnClick,1);
-    btn1.SetAlignment(ALIGN_CENTRE, ALIGN_BOTTOM);
-    btn1.SetPosition(0, -45);
 	btn1.SetLabel(&btn1Txt);
-	btn1.SetImage(&btn1Img);
-	btn1.SetSoundOver(&btnSoundOver);
-	btn1.SetSoundClick(&btnClick);
-	btn1.SetTrigger(&trigA);
 	btn1.SetState(STATE_SELECTED);
-	btn1.SetEffectGrow();
 	
 	if ((Settings.wsprompt == yes) && (CFG.widescreen)){/////////////adjust buttons for widescreen
 		btn1.SetAlignment(ALIGN_CENTRE, ALIGN_BOTTOM);
@@ -1946,7 +1861,6 @@ ProgressWindow(const char *title, const char *msg)
 	snprintf(imgPath, sizeof(imgPath), "%sprogressbar_outline.png", CFG.theme_path);
 	GuiImageData progressbarOutline(imgPath, progressbar_outline_png);
 
-	//GuiImageData progressbarOutline(progressbar_outline_png);
 	GuiImage progressbarOutlineImg(&progressbarOutline);
 	if (Settings.wsprompt == yes){
 	progressbarOutlineImg.SetWidescreen(CFG.widescreen);}
@@ -1955,7 +1869,6 @@ ProgressWindow(const char *title, const char *msg)
 
 	snprintf(imgPath, sizeof(imgPath), "%sprogressbar_empty.png", CFG.theme_path);
 	GuiImageData progressbarEmpty(imgPath, progressbar_empty_png);
-	//GuiImageData progressbarEmpty(progressbar_empty_png);
 	GuiImage progressbarEmptyImg(&progressbarEmpty);
 	progressbarEmptyImg.SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE);
 	progressbarEmptyImg.SetPosition(25, 40);
@@ -1963,7 +1876,6 @@ ProgressWindow(const char *title, const char *msg)
 
 	snprintf(imgPath, sizeof(imgPath), "%sprogressbar.png", CFG.theme_path);
 	GuiImageData progressbar(imgPath, progressbar_png);
-	//GuiImageData progressbar(progressbar_png);
 	
 	progressbarImg.SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE);
 	progressbarImg.SetPosition(25, 40);
@@ -2108,16 +2020,9 @@ ProgressDownloadWindow(int choice2)
 	if (Settings.wsprompt == yes){
 	btn1Txt.SetWidescreen(CFG.widescreen);
 	btn1Img.SetWidescreen(CFG.widescreen);}
-	GuiButton btn1(btnOutline.GetWidth(), btnOutline.GetHeight());
+	GuiButton btn1(&btn1Img,&btn1Img, 2, 4, 0, -45, &trigA, &btnSoundOver, &btnClick,1);
-    btn1.SetAlignment(ALIGN_CENTRE, ALIGN_BOTTOM);
-    btn1.SetPosition(0, -45);
 	btn1.SetLabel(&btn1Txt);
-	btn1.SetImage(&btn1Img);
-	btn1.SetSoundOver(&btnSoundOver);
-	btn1.SetSoundClick(&btnClick);
-	btn1.SetTrigger(&trigA);
 	btn1.SetState(STATE_SELECTED);
-	btn1.SetEffectGrow();
 	
 	if ((Settings.wsprompt == yes) && (CFG.widescreen)){/////////////adjust for widescreen
 		progressbarOutlineImg.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE);
@@ -2326,7 +2231,7 @@ ProgressUpdateWindow()
 	progressbarImg.SetPosition(25, 7);
 
     char title[50];
-    sprintf(title, "%s", "Checking for Updates");
+    sprintf(title, "%s", LANGUAGE.CheckingforUpdates);
 	GuiText titleTxt(title, 26, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{0, 0, 0, 255});
 	titleTxt.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
 	titleTxt.SetPosition(0,50);
@@ -2348,16 +2253,9 @@ ProgressUpdateWindow()
 	if (Settings.wsprompt == yes){
 	btn1Txt.SetWidescreen(CFG.widescreen);
 	btn1Img.SetWidescreen(CFG.widescreen);}
-	GuiButton btn1(btnOutline.GetWidth(), btnOutline.GetHeight());
+	GuiButton btn1(&btn1Img,&btn1Img, 2, 4, 0, -40, &trigA, &btnSoundOver, &btnClick,1);
-    btn1.SetAlignment(ALIGN_CENTRE, ALIGN_BOTTOM);
-    btn1.SetPosition(0, -40);
 	btn1.SetLabel(&btn1Txt);
-	btn1.SetImage(&btn1Img);
-	btn1.SetSoundOver(&btnSoundOver);
-	btn1.SetSoundClick(&btnClick);
-	btn1.SetTrigger(&trigA);
 	btn1.SetState(STATE_SELECTED);
-	btn1.SetEffectGrow();
 	
 	if ((Settings.wsprompt == yes) && (CFG.widescreen)){/////////////adjust for widescreen
 		progressbarOutlineImg.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE);
@@ -2465,10 +2363,11 @@ ProgressUpdateWindow()
     }
 
     if(revnumber > currentrev) {
-        sprintf(msg, "Rev%i available.", revnumber);
+        sprintf(msg, "Rev%i %s.", revnumber, LANGUAGE.available);
-        int choice = WindowPrompt(msg, "Do you want to update?", LANGUAGE.Yes, LANGUAGE.No, 0, 0);
+        int choice = WindowPrompt(msg, LANGUAGE.Doyouwanttoupdate, LANGUAGE.Yes, LANGUAGE.No, 0, 0);
         if(choice == 1) {
-            sprintf(title, "%s", "Updating USB Loader GX");
+            //sprintf(title, "%s", "%s USB Loader GX", LANGUAGE.updating);
+            sprintf(title, "%s USB Loader GX", LANGUAGE.updating);
             titleTxt.SetText(title);
             msgTxt.SetPosition(0,100);
             promptWindow.Append(&progressbarEmptyImg);
@@ -2550,7 +2449,7 @@ ProgressUpdateWindow()
         }
 
     } else {
-        WindowPrompt("No new updates", 0, "OK", 0, 0, 0);
+        WindowPrompt(LANGUAGE.Nonewupdates, 0, LANGUAGE.ok, 0, 0, 0);
         ret = -1;
     }
 
@@ -2559,7 +2458,7 @@ ProgressUpdateWindow()
     CloseConnection();
 
     if(!failed && ret >= 0) {
-        WindowPrompt("Successfully updated ", "Restarting the Loader", "OK", 0, 0, 0);
+        WindowPrompt(LANGUAGE.Successfullyupdated , LANGUAGE.Restarting, LANGUAGE.ok, 0, 0, 0);
         if (*((u32*) 0x80001800)) exit(0);
         SYS_ResetSystem(SYS_RETURNTOMENU, 0, 0);
     }
@@ -2844,34 +2743,17 @@ static int OnScreenKeyboard(char * var, u32 maxlen, int min)
 	okBtnTxt.SetWidescreen(CFG.widescreen);
 	okBtnImg.SetWidescreen(CFG.widescreen);
 	}
-	GuiButton okBtn(btnOutline.GetWidth(), btnOutline.GetHeight());
+	GuiButton okBtn(&okBtnImg,&okBtnImg, 0, 4, 5, 15, &trigA, &btnSoundOver, &btnClick,1);
-
-	okBtn.SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM);
-	okBtn.SetPosition(5, 15);
-
 	okBtn.SetLabel(&okBtnTxt);
-	okBtn.SetImage(&okBtnImg);
-	okBtn.SetSoundOver(&btnSoundOver);
-	okBtn.SetSoundClick(&btnClick);
-	okBtn.SetTrigger(&trigA);
-	okBtn.SetEffectGrow();
-
 	GuiText cancelBtnTxt(LANGUAGE.Cancel, 22, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{0, 0, 0, 255});
 	GuiImage cancelBtnImg(&btnOutline);
 	if (Settings.wsprompt == yes){
 	cancelBtnTxt.SetWidescreen(CFG.widescreen);
 	cancelBtnImg.SetWidescreen(CFG.widescreen);
 	}
-	GuiButton cancelBtn(btnOutline.GetWidth(), btnOutline.GetHeight());
+	GuiButton cancelBtn(&cancelBtnImg,&cancelBtnImg, 1, 4, -5, 15, &trigA, &btnSoundOver, &btnClick,1);
-	cancelBtn.SetAlignment(ALIGN_RIGHT, ALIGN_BOTTOM);
-	cancelBtn.SetPosition(-5, 15);//(-25, -25);
 	cancelBtn.SetLabel(&cancelBtnTxt);
-	cancelBtn.SetImage(&cancelBtnImg);
-	cancelBtn.SetSoundOver(&btnSoundOver);
-	cancelBtn.SetSoundClick(&btnClick);
-	cancelBtn.SetTrigger(&trigA);
 	cancelBtn.SetTrigger(&trigB);
-	cancelBtn.SetEffectGrow();
 	
 	keyboard.Append(&okBtn);
 	keyboard.Append(&cancelBtn);
@@ -3184,16 +3066,9 @@ static int MenuDiscList()
 	GuiImage installBtnImgOver(&btnInstallOver);
 	installBtnImg.SetWidescreen(CFG.widescreen);
 	installBtnImgOver.SetWidescreen(CFG.widescreen);
-	GuiButton installBtn(btnInstall.GetWidth(), btnInstall.GetHeight());
+	
-	installBtn.SetAlignment(ALIGN_LEFT, ALIGN_TOP);
+	GuiButton installBtn(&installBtnImg, &installBtnImgOver, ALIGN_LEFT, ALIGN_TOP, THEME.install_x, THEME.install_y, &trigA, &btnSoundOver, &btnClick, 1, &installBtnTT,24,-30, 0,5);
-	installBtn.SetPosition(THEME.install_x, THEME.install_y);
+	
-	installBtn.SetImage(&installBtnImg);
-	installBtn.SetImageOver(&installBtnImgOver);
-	installBtn.SetSoundOver(&btnSoundOver);
-	installBtn.SetSoundClick(&btnClick);
-	installBtn.SetTrigger(&trigA);
-	installBtn.SetEffectGrow();
-	installBtn.SetToolTip(&installBtnTT,24,-30, ALIGN_LEFT);
 	
 	GuiTooltip settingsBtnTT(LANGUAGE.settings);
 	if (Settings.wsprompt == yes)
@@ -3203,17 +3078,7 @@ static int MenuDiscList()
 	settingsBtnImg.SetWidescreen(CFG.widescreen);
 	GuiImage settingsBtnImgOver(&btnSettingsOver);
 	settingsBtnImgOver.SetWidescreen(CFG.widescreen);
-	GuiButton settingsBtn(btnSettings.GetWidth(), btnSettings.GetHeight());
+	GuiButton settingsBtn(&settingsBtnImg,&settingsBtnImgOver, 0, 3, THEME.setting_x, THEME.setting_y, &trigA, &btnSoundOver, &btnClick,1,&settingsBtnTT,65,-30,0,5);
-	settingsBtn.SetAlignment(ALIGN_LEFT, ALIGN_TOP);
-	settingsBtn.SetPosition(THEME.setting_x, THEME.setting_y);
-	settingsBtn.SetImage(&settingsBtnImg);
-	settingsBtn.SetImageOver(&settingsBtnImgOver);
-	settingsBtn.SetSoundOver(&btnSoundOver);
-	settingsBtn.SetSoundClick(&btnClick);
-	settingsBtn.SetTrigger(&trigA);
-	settingsBtn.SetEffectGrow();
-	settingsBtn.SetToolTip(&settingsBtnTT,65,-30);
-
 	GuiTooltip homeBtnTT(LANGUAGE.BacktoHBCorWiiMenu);
 	if (Settings.wsprompt == yes)
 		homeBtnTT.SetWidescreen(CFG.widescreen);
@@ -3222,16 +3087,8 @@ static int MenuDiscList()
 	homeBtnImg.SetWidescreen(CFG.widescreen);
 	GuiImage homeBtnImgOver(&btnhomeOver);
 	homeBtnImgOver.SetWidescreen(CFG.widescreen);
-	GuiButton homeBtn(btnhome.GetWidth(), btnhome.GetHeight());
+	GuiButton homeBtn(&homeBtnImg,&homeBtnImgOver, 0, 3, THEME.home_x, THEME.home_y, &trigA, &btnSoundOver, &btnClick,1,&homeBtnTT,15,-30,1,5);
-	homeBtn.SetAlignment(ALIGN_LEFT, ALIGN_TOP);
-	homeBtn.SetPosition(THEME.home_x, THEME.home_y);
-	homeBtn.SetImage(&homeBtnImg);
-	homeBtn.SetImageOver(&homeBtnImgOver);
-	homeBtn.SetSoundOver(&btnSoundOver);
-	homeBtn.SetTrigger(&trigA);
 	homeBtn.SetTrigger(&trigHome);
-	homeBtn.SetEffectGrow();
-	homeBtn.SetToolTip(&homeBtnTT,15,-30);
 	
 	GuiTooltip poweroffBtnTT(LANGUAGE.PowerofftheWii);
 	if (Settings.wsprompt == yes)
@@ -3241,16 +3098,7 @@ static int MenuDiscList()
 	GuiImage poweroffBtnImgOver(&btnpwroffOver);
 	poweroffBtnImg.SetWidescreen(CFG.widescreen);
 	poweroffBtnImgOver.SetWidescreen(CFG.widescreen);
-	GuiButton poweroffBtn(btnpwroff.GetWidth(), btnpwroff.GetHeight());
+	GuiButton poweroffBtn(&poweroffBtnImg,&poweroffBtnImgOver, 0, 3, THEME.power_x, THEME.power_y, &trigA, &btnSoundOver, &btnClick,1,&poweroffBtnTT,-10,-30,1,5);
-	poweroffBtn.SetAlignment(ALIGN_LEFT, ALIGN_TOP);
-	poweroffBtn.SetPosition(THEME.power_x, THEME.power_y);
-	poweroffBtn.SetImage(&poweroffBtnImg);
-	poweroffBtn.SetImageOver(&poweroffBtnImgOver);
-	poweroffBtn.SetSoundOver(&btnSoundOver);
-	poweroffBtn.SetSoundClick(&btnClick);
-	poweroffBtn.SetTrigger(&trigA);
-	poweroffBtn.SetEffectGrow();
-	poweroffBtn.SetToolTip(&poweroffBtnTT,-10,-30);
 	
 
 	GuiTooltip sdcardBtnTT(LANGUAGE.ReloadSD);
@@ -3259,52 +3107,24 @@ static int MenuDiscList()
 
 	GuiImage sdcardImg(&btnsdcard);
 	sdcardImg.SetWidescreen(CFG.widescreen);
-	GuiButton sdcardBtn(btnsdcard.GetWidth(), btnsdcard.GetHeight());
+	GuiButton sdcardBtn(&sdcardImg,&sdcardImg, 0, 3, THEME.sdcard_x, THEME.sdcard_y, &trigA, &btnSoundOver, &btnClick,1,&sdcardBtnTT,15,-30,0,5);
-	sdcardBtn.SetAlignment(ALIGN_LEFT, ALIGN_TOP);
-	sdcardBtn.SetPosition(THEME.sdcard_x, THEME.sdcard_y);
-	sdcardBtn.SetImage(&sdcardImg);
-	sdcardBtn.SetSoundOver(&btnSoundOver);
-	sdcardBtn.SetSoundClick(&btnClick);
-	sdcardBtn.SetTrigger(&trigA);
-	sdcardBtn.SetEffectGrow();
-	sdcardBtn.SetToolTip(&sdcardBtnTT,95,-40);
 	
 	GuiImage wiiBtnImg(&dataID);
 	wiiBtnImg.SetWidescreen(CFG.widescreen);
-	GuiButton wiiBtn(wiiBtnImg.GetWidth(), wiiBtnImg.GetHeight());
+	GuiButton wiiBtn(&wiiBtnImg,&wiiBtnImg, 0, 4, 0, -10, &trigA, &btnSoundOver, &btnClick,0);
-	wiiBtn.SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM);
-	wiiBtn.SetPosition(0,-10);
-	wiiBtn.SetImage(&wiiBtnImg);
-	wiiBtn.SetSoundOver(&btnSoundOver);
-	wiiBtn.SetSoundClick(&btnClick);
-	wiiBtn.SetTrigger(&trigA);
 	
 	GuiImage favoriteBtnImg(&imgfavIcon);
 	GuiImage favoriteBtnImg_g(&imgfavIcon_gray);
 	favoriteBtnImg.SetWidescreen(CFG.widescreen);
 	favoriteBtnImg_g.SetWidescreen(CFG.widescreen);
-	GuiButton favoriteBtn(favoriteBtnImg.GetWidth(), favoriteBtnImg.GetHeight());
+	GuiButton favoriteBtn(&favoriteBtnImg_g,&favoriteBtnImg_g, 2, 3, 20, 15, &trigA, &btnSoundOver, &btnClick,1);
-	favoriteBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);//(ALIGN_CENTRE, ALIGN_MIDDLE);
-	//Set Pos later favoriteBtn.SetPosition(20, 15);
-	favoriteBtn.SetImage(&favoriteBtnImg_g);
-	favoriteBtn.SetSoundOver(&btnSoundOver);
-	favoriteBtn.SetSoundClick(&btnClick);
-	favoriteBtn.SetTrigger(&trigA);
-	favoriteBtn.SetEffectGrow();
 	favoriteBtn.SetAlpha(180);
 
 	GuiImage abcBtnImg(&imgabcIcon);
 	abcBtnImg.SetWidescreen(CFG.widescreen);
 	GuiImage abcBtnImg_g(&imgabcIcon_gray);
 	abcBtnImg_g.SetWidescreen(CFG.widescreen);
-	GuiButton abcBtn(abcBtnImg.GetWidth(), abcBtnImg.GetHeight());
+	GuiButton abcBtn(&abcBtnImg_g,&abcBtnImg_g, 2, 3, 52, 15, &trigA, &btnSoundOver, &btnClick,1);
-	abcBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);//(ALIGN_CENTRE, ALIGN_MIDDLE);
-	//Set Pos later abcBtn.SetPosition(52, 15);
-	abcBtn.SetImage(&abcBtnImg_g);
-	abcBtn.SetSoundOver(&btnSoundOver);
-	abcBtn.SetSoundClick(&btnClick);
-	abcBtn.SetTrigger(&trigA);
-	abcBtn.SetEffectGrow();
 	abcBtn.SetAlpha(180);
 
 
@@ -3312,15 +3132,7 @@ static int MenuDiscList()
 	countBtnImg.SetWidescreen(CFG.widescreen);
 	GuiImage countBtnImg_g(&imgplayCountIcon_gray);
 	countBtnImg_g.SetWidescreen(CFG.widescreen);
-	GuiButton countBtn(countBtnImg.GetWidth(), countBtnImg.GetHeight());
+	GuiButton countBtn(&countBtnImg_g,&countBtnImg_g, 2, 3, 84, 15, &trigA, &btnSoundOver, &btnClick,1);
-	countBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);//(ALIGN_CENTRE, ALIGN_MIDDLE);
-	//Set Pos later countBtn.SetPosition(84, 15);
-	countBtn.SetImage(&countBtnImg_g);
-	countBtn.SetImage(&countBtnImg_g);
-	countBtn.SetSoundOver(&btnSoundOver);
-	countBtn.SetSoundClick(&btnClick);
-	countBtn.SetTrigger(&trigA);
-	countBtn.SetEffectGrow();
 	countBtn.SetAlpha(180);
 
 
@@ -3330,14 +3142,7 @@ static int MenuDiscList()
 	GuiImage listBtnImg_g(&imgarrangeList_gray);
 	gridBtnImg_g.SetWidescreen(CFG.widescreen);
 	listBtnImg_g.SetWidescreen(CFG.widescreen);
-	GuiButton gridBtn(gridBtnImg.GetWidth(), gridBtnImg.GetHeight());
+	GuiButton gridBtn(&gridBtnImg_g,&gridBtnImg_g, 2, 3, 116, 15, &trigA, &btnSoundOver, &btnClick,1);
-	gridBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);//(ALIGN_CENTRE, ALIGN_MIDDLE);
-	//Set Pos later gridBtn.SetPosition(116, 15);
-	gridBtn.SetImage(&gridBtnImg_g);
-	gridBtn.SetSoundOver(&btnSoundOver);
-	gridBtn.SetSoundClick(&btnClick);
-	gridBtn.SetTrigger(&trigA);
-	gridBtn.SetEffectGrow();
 	gridBtn.SetAlpha(180);
 	if (Settings.gameDisplay==grid)gridBtn.SetImage(&listBtnImg_g);
 
@@ -3345,14 +3150,7 @@ static int MenuDiscList()
 	carosselleBtnImg.SetWidescreen(CFG.widescreen);
 	GuiImage carosselleBtnImg_g(&imgarrangeCarosselle_gray);
 	carosselleBtnImg_g.SetWidescreen(CFG.widescreen);
-	GuiButton carosselleBtn(carosselleBtnImg.GetWidth(), carosselleBtnImg.GetHeight());
+	GuiButton carosselleBtn(&carosselleBtnImg_g,&carosselleBtnImg_g, 2, 3, 148, 15, &trigA, &btnSoundOver, &btnClick,1);
-	carosselleBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);//(ALIGN_CENTRE, ALIGN_MIDDLE);
-	//Set Pos later carosselleBtn.SetPosition(148, 15);
-	carosselleBtn.SetImage(&carosselleBtnImg_g);
-	carosselleBtn.SetSoundOver(&btnSoundOver);
-	carosselleBtn.SetSoundClick(&btnClick);
-	carosselleBtn.SetTrigger(&trigA);
-	carosselleBtn.SetEffectGrow();
 	carosselleBtn.SetAlpha(180);
 
 	if (Settings.fave)
@@ -4295,30 +4093,13 @@ static int MenuFormat()
 	GuiImage poweroffBtnImgOver(&btnpwroffOver);
 	poweroffBtnImg.SetWidescreen(CFG.widescreen);
 	poweroffBtnImgOver.SetWidescreen(CFG.widescreen);
-	GuiButton poweroffBtn(btnpwroff.GetWidth(), btnpwroff.GetHeight());
+	GuiButton poweroffBtn(&poweroffBtnImg,&poweroffBtnImgOver, 0, 3, THEME.power_x, THEME.power_y, &trigA, &btnSoundOver, &btnClick,1);
-	poweroffBtn.SetAlignment(ALIGN_LEFT, ALIGN_TOP);
-	poweroffBtn.SetPosition(THEME.power_x, THEME.power_y);
-	poweroffBtn.SetImage(&poweroffBtnImg);
-	poweroffBtn.SetImageOver(&poweroffBtnImgOver);
-	poweroffBtn.SetSoundOver(&btnSoundOver);
-	poweroffBtn.SetSoundClick(&btnClick);
-	poweroffBtn.SetTrigger(&trigA);
-	poweroffBtn.SetEffectGrow();
-
 	GuiImage exitBtnImg(&btnhome);
 	GuiImage exitBtnImgOver(&btnhomeOver);
 	exitBtnImg.SetWidescreen(CFG.widescreen);
 	exitBtnImgOver.SetWidescreen(CFG.widescreen);
-	GuiButton exitBtn(btnhome.GetWidth(), btnhome.GetHeight());
+	GuiButton exitBtn(&exitBtnImg,&exitBtnImgOver, 0, 3, 0,-10, &trigA, &btnSoundOver, &btnClick,1);
-	exitBtn.SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM);
-	exitBtn.SetPosition(0, -10);
-	exitBtn.SetImage(&exitBtnImg);
-	exitBtn.SetImageOver(&exitBtnImgOver);
-	exitBtn.SetSoundOver(&btnSoundOver);
-	exitBtn.SetSoundClick(&btnClick);
-	exitBtn.SetTrigger(&trigA);
 	exitBtn.SetTrigger(&trigHome);
-	exitBtn.SetEffectGrow();
 	
 	#ifdef HW_RVL
 	int i = 0, level;
@@ -4547,16 +4328,9 @@ static int MenuSettings()
 	if (Settings.wsprompt == yes){
 	backBtnTxt.SetWidescreen(CFG.widescreen);
 	backBtnImg.SetWidescreen(CFG.widescreen);}
-	GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight());
+	GuiButton backBtn(&backBtnImg,&backBtnImg, 2, 3, -180, 400, &trigA, &btnSoundOver, &btnClick,1);
-	backBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
-	backBtn.SetPosition(-180, 400);
 	backBtn.SetLabel(&backBtnTxt);
-	backBtn.SetImage(&backBtnImg);
-	backBtn.SetSoundOver(&btnSoundOver);
-	backBtn.SetSoundClick(&btnClick);
-	backBtn.SetTrigger(&trigA);
 	backBtn.SetTrigger(&trigB);
-	backBtn.SetEffectGrow();
 	
 	GuiButton homo(1,1);
 	homo.SetTrigger(&trigHome);
@@ -4603,28 +4377,14 @@ static int MenuSettings()
 	lockBtnTxt.SetMaxWidth(btnOutline.GetWidth()-30);
 	GuiImage lockBtnImg(&btnOutline);
 	lockBtnImg.SetWidescreen(CFG.widescreen);
-	GuiButton lockBtn(btnOutline.GetWidth(), btnOutline.GetHeight());
+	GuiButton lockBtn(&lockBtnImg,&lockBtnImg, 2, 3, 180, 400, &trigA, &btnSoundOver, &btnClick,1);
-	lockBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
-	lockBtn.SetPosition(180, 400);
 	lockBtn.SetLabel(&lockBtnTxt);
-	lockBtn.SetImage(&lockBtnImg);
-	lockBtn.SetSoundOver(&btnSoundOver);
-	lockBtn.SetSoundClick(&btnClick);
-	lockBtn.SetTrigger(&trigA);
-	lockBtn.SetEffectGrow();
 	
     GuiImage updateBtnImg(&updateRevImgData);
 	updateBtnImg.SetWidescreen(CFG.widescreen);
-	GuiButton updateBtn(updateBtnImg.GetWidth(), updateBtnImg.GetHeight());
+	GuiButton updateBtn(&updateBtnImg,&updateBtnImg, 2, 3, 70, 400, &trigA, &btnSoundOver, &btnClick,1);
-	updateBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
-	updateBtn.SetPosition(70, 400);
-	updateBtn.SetImage(&updateBtnImg);
-	updateBtn.SetSoundOver(&btnSoundOver);
-	updateBtn.SetSoundClick(&btnClick);
-	updateBtn.SetTrigger(&trigA);
 	updateBtn.SetVisible(false);
 	updateBtn.SetClickable(false);
-	updateBtn.SetEffectGrow();
 	
 	GuiImageData logo(credits_button_png);
 	GuiImage logoImg(&logo);
@@ -5605,6 +5365,7 @@ int GameSettings(struct discHdr * header)
     sprintf(options3.name[6],"%s", LANGUAGE.Defaultgamesettings);
 
 	GuiSound btnSoundOver(button_over_pcm, button_over_pcm_size, SOUND_PCM, vol);
+	GuiSound btnClick(button_click2_pcm, button_click2_pcm_size, SOUND_PCM, vol);
 
 	char imgPath[100];
 
@@ -5637,15 +5398,9 @@ int GameSettings(struct discHdr * header)
 	if (Settings.wsprompt == yes){
 	saveBtnTxt.SetWidescreen(CFG.widescreen);
 	saveBtnImg.SetWidescreen(CFG.widescreen);}
-	GuiButton saveBtn(btnOutline.GetWidth(), btnOutline.GetHeight());
+	GuiButton saveBtn(&saveBtnImg,&saveBtnImg, 2, 3, -180, 400, &trigA, &btnSoundOver, &btnClick,1);
 	saveBtn.SetScale(0.9);
-	saveBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
-	saveBtn.SetPosition(-180, 400);
 	saveBtn.SetLabel(&saveBtnTxt);
-	saveBtn.SetImage(&saveBtnImg);
-	saveBtn.SetSoundOver(&btnSoundOver);
-	saveBtn.SetTrigger(&trigA);
-	saveBtn.SetEffectGrow();
 	
     GuiText cancelBtnTxt(LANGUAGE.Back, 22, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{0, 0, 0, 255});
 	cancelBtnTxt.SetMaxWidth(btnOutline.GetWidth()-30);
@@ -5653,16 +5408,10 @@ int GameSettings(struct discHdr * header)
 	if (Settings.wsprompt == yes){
 	cancelBtnTxt.SetWidescreen(CFG.widescreen);
 	cancelBtnImg.SetWidescreen(CFG.widescreen);}
-	GuiButton cancelBtn(btnOutline.GetWidth(), btnOutline.GetHeight());
+	GuiButton cancelBtn(&cancelBtnImg,&cancelBtnImg, 2, 3, 180, 400, &trigA, &btnSoundOver, &btnClick,1);
 	cancelBtn.SetScale(0.9);
-	cancelBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
-	cancelBtn.SetPosition(180, 400);
 	cancelBtn.SetLabel(&cancelBtnTxt);
-	cancelBtn.SetImage(&cancelBtnImg);
-	cancelBtn.SetSoundOver(&btnSoundOver);
-	cancelBtn.SetTrigger(&trigA);
 	cancelBtn.SetTrigger(&trigB);
-	cancelBtn.SetEffectGrow();
 	
 	GuiText deleteBtnTxt(LANGUAGE.Uninstall, 22, (GXColor){THEME.prompttxt_r, THEME.prompttxt_g, THEME.prompttxt_b, 255}); //{0, 0, 0, 255});
 	deleteBtnTxt.SetMaxWidth(btnOutline.GetWidth()-30);
@@ -5670,15 +5419,9 @@ int GameSettings(struct discHdr * header)
 	if (Settings.wsprompt == yes){
 	deleteBtnTxt.SetWidescreen(CFG.widescreen);
 	deleteBtnImg.SetWidescreen(CFG.widescreen);}
-	GuiButton deleteBtn(btnOutline.GetWidth(), btnOutline.GetHeight());
+	GuiButton deleteBtn(&deleteBtnImg,&deleteBtnImg, 2, 3, 0, 400, &trigA, &btnSoundOver, &btnClick,1);
 	deleteBtn.SetScale(0.9);
-	deleteBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
-	deleteBtn.SetPosition(0, 400);
 	deleteBtn.SetLabel(&deleteBtnTxt);
-	deleteBtn.SetImage(&deleteBtnImg);
-	deleteBtn.SetSoundOver(&btnSoundOver);
-	deleteBtn.SetTrigger(&trigA);
-	deleteBtn.SetEffectGrow();
 	
 	GuiCustomOptionBrowser optionBrowser3(396, 280, &options3, CFG.theme_path, "bg_options_gamesettings.png", bg_options_settings_png, 0, 200);
 	optionBrowser3.SetPosition(0, 90);