diff --git a/source/language.c b/source/language.c
index c2a89a14..73f241fa 100644
--- a/source/language.c
+++ b/source/language.c
@@ -540,6 +540,11 @@ void language_set(char *name, char *val)
 		strcopy(LANGUAGE.HowtoShutdown, val, sizeof(LANGUAGE.HowtoShutdown));
 		return;
 	}
+	if (strcmp(name, "Keyboard") == 0) {
+		strcopy(LANGUAGE.keyboard, val, sizeof(LANGUAGE.keyboard));
+		return;
+	}
+
 	if (strcmp(name, "Language") == 0) {
 		strcopy(LANGUAGE.Language, val, sizeof(LANGUAGE.Language));
 		return;
diff --git a/source/language.h b/source/language.h
index a9a6640b..baef1590 100644
--- a/source/language.h
+++ b/source/language.h
@@ -12,95 +12,95 @@ extern "C"
 struct LANGUAGE
 {
 
-	char t3Covers[20];
-	char AppLanguage[20];
-	char Areyousure[15];
-	char AutoPatch[15];
-	char Back[15];
-	char BacktoHBCorWiiMenu[25];
-	char BacktoLoader[20];
-	char BacktoWiiMenu[20];
-	char BootStandard[20];
-	char Both[8];
-	char Cantcreatedirectory[25];
+	char t3Covers[50];
+	char AppLanguage[50];
+	char Areyousure[50];
+	char AutoPatch[20];
+	char Back[20];
+	char BacktoHBCorWiiMenu[50];
+	char BacktoLoader[50];
+	char BacktoWiiMenu[50];
+	char BootStandard[50];
+	char Both[15];
+	char Cantcreatedirectory[50];
 	char Cancel[20];
-	char Cantbeformated[30];
-	char Cantdelete[25];
-	char ClicktoDownloadCovers[30];
-	char Clock[10];
-	char Continueinstallgame[25];
-	char ConsoleDefault[25];
-	char Consoleshouldbeunlockedtomodifyit[50];
-	char ConsoleLocked[25];
-	char CorrectPassword[25];
-	char Couldnotinitializenetwork[30];
-	char CouldnotopenDisc[52];
-	char CouldnotinitializeDIPmodule[30];
-	char CoverDownload[25];
-	char CoverPath[20];
-	char CoverpathChanged[30];
-	char Coverpathchange[30];
-	char Credits[15];
-	char DiscImages[15];
-	char DiscimagePath[25];
-	char DiscpathChanged[25];
-	char Discpathchange[25];
-	char DiscDefault[25];
-	char Display[20];
-	char Doyouwanttoformat[30];
-	char Doyoureallywanttodelete[35];
-	char Doyouwanttoretryfor30secs[50];
-	char Downloadingfile[30];
-	char DownloadBoxartimage[30];
-	char Downloadfinished[30];
-	char Error[10];
-	char BOOTERROR[15];
-	char ErrorreadingDisc[25];
-	char ExitUSBISOLoader[25];
-	char InitializingNetwork[30];
-	char InsertDisk[25];
-	char InsertaWiiDisc[25];
-	char InsertaSDCardtodownloadimages[50];
-	char InsertaSDCardtosave[35];
-	char InstallRenameandDeleteareunlocked[50];
-	char Installerror[30];
-	char Installagame[30];
-	char Installinggame[30];
-	char Failedtoboot[30];
-	char FailedtomountfrontSDcard[50];
-	char FailedtosetUSB[30];
-	char Failedformating[30];
-	char Filenotfound[30];
-	char filesnotfoundontheserver[50];
-	char filesleft[30];
-	char FlipX[30];
-	char Force[30];
-	char Youneedtoformatapartition[50];
-	char Format[30];
-	char Formattingpleasewait[50];
+	char Cantbeformated[50];
+	char Cantdelete[50];
+	char ClicktoDownloadCovers[50];
+	char Clock[20];
+	char Continueinstallgame[50];
+	char ConsoleDefault[50];
+	char Consoleshouldbeunlockedtomodifyit[100];
+	char ConsoleLocked[50];
+	char CorrectPassword[50];
+	char Couldnotinitializenetwork[50];
+	char CouldnotopenDisc[50];
+	char CouldnotinitializeDIPmodule[60];
+	char CoverDownload[50];
+	char CoverPath[50];
+	char CoverpathChanged[50];
+	char Coverpathchange[50];
+	char Credits[30];
+	char DiscImages[50];
+	char DiscimagePath[50];
+	char DiscpathChanged[50];
+	char Discpathchange[50];
+	char DiscDefault[50];
+	char Display[30];
+	char Doyouwanttoformat[50];
+	char Doyoureallywanttodelete[50];
+	char Doyouwanttoretryfor30secs[80];
+	char Downloadingfile[50];
+	char DownloadBoxartimage[50];
+	char Downloadfinished[50];
+	char Error[30];
+	char BOOTERROR[50];
+	char ErrorreadingDisc[50];
+	char ExitUSBISOLoader[50];
+	char InitializingNetwork[50];
+	char InsertDisk[50];
+	char InsertaWiiDisc[50];
+	char InsertaSDCardtodownloadimages[80];
+	char InsertaSDCardtosave[60];
+	char InstallRenameandDeleteareunlocked[100];
+	char Installerror[50];
+	char Installagame[50];
+	char Installinggame[50];
+	char Failedtoboot[50];
+	char FailedtomountfrontSDcard[80];
+	char FailedtosetUSB[50];
+	char Failedformating[50];
+	char Filenotfound[50];
+	char filesnotfoundontheserver[80];
+	char filesleft[50];
+	char FlipX[50];
+	char Force[50];
+	char Youneedtoformatapartition[80];
+	char Format[50];
+	char Formattingpleasewait[70];
 	char formated[30];
 	char free[30];
-	char FreeSpace[30];
-	char FullShutdown[30];
+	char FreeSpace[50];
+	char FullShutdown[50];
 	char GameID[30];
-	char Games[30];
-	char Gameisalreadyinstalled[50];
-	char GameRegion[30];
-	char GameSize[30];
-	char GoBack[30];
-	char GotoPage[30];///////
-	char HowtoShutdown[30];
-	char keyboard[15];
-	char Language[20];
-	char Langchange[20];
-	char Left[30];
-	char LikeSysMenu[30];
-	char LoadingincIOS[40];
-	char Loadingstandardlanguage[40];
+	char Games[50];
+	char Gameisalreadyinstalled[90];
+	char GameRegion[50];
+	char GameSize[50];
+	char GoBack[50];
+	char GotoPage[50];///////
+	char HowtoShutdown[50];
+	char keyboard[50];
+	char Language[50];
+	char Langchange[50];
+	char Left[50];
+	char LikeSysMenu[50];
+	char LoadingincIOS[50];
+	char Loadingstandardlanguage[80];
 	char Lock[30];
-	char LockConsole[40];
-	char MP3Menu[30];
-	char Missingfiles[40];
+	char LockConsole[50];
+	char MP3Menu[40];
+	char Missingfiles[50];
 	char Networkiniterror[50];
 	char Neither[40];
 	char Next[40];
@@ -116,79 +116,79 @@ struct LANGUAGE
 	char NotaWiiDisc[40];
 	char NoUSBDevicefound[50];
 	char Notenoughfreespace[50];
-	char notset[30];
-	char of[10];
-	char OFF[15];
-	char OfficialSite[30];
-	char ok[8];
-	char ON[15];
-	char Parentalcontrol[25];
-	char Partition[20];
-	char Password[20];
-	char PasswordChanged[30];
-	char Passwordhasbeenchanged[50];
-	char Passwordchange[30];
-	char PowerofftheWii[30];
-	char Prev[20];
-	char PromptsButtons[30];
-	char ReloadSD[20];
-	char RenameGameonWBFS[30];
-	char Restart[15];
-	char Return[15];
-	char ReturntoWiiMenu[30];
-	char Right[15];
-	char Rumble[15];
-	char QuickBoot[20];
-	char Save[15];
-	char SaveFailed[20];
-	char Specialthanksto[25];
-	char For[10];
+	char notset[40];
+	char of[30];
+	char OFF[30];
+	char OfficialSite[50];
+	char ok[30];
+	char ON[30];
+	char Parentalcontrol[50];
+	char Partition[50];
+	char Password[50];
+	char PasswordChanged[50];
+	char Passwordhasbeenchanged[80];
+	char Passwordchange[50];
+	char PowerofftheWii[50];
+	char Prev[50];
+	char PromptsButtons[50];
+	char ReloadSD[50];
+	char RenameGameonWBFS[50];
+	char Restart[30];
+	char Return[30];
+	char ReturntoWiiMenu[50];
+	char Right[30];
+	char Rumble[30];
+	char QuickBoot[50];
+	char Save[30];
+	char SaveFailed[50];
+	char Specialthanksto[50];
+	char For[20];
 	char theUSBLoaderandreleasingthesourcecode[100];
-	char secondsleft[20];
-	char SelectthePartition[25];
-	char youwanttoformat[20];
-	char settings[25];
-	char ShutdowntoIdle[25];
-	char ShutdownSystem[25];
-	char Success[15];
-	char Successfullyinstalled[40];
-	char Successfullydeleted[40];
-	char SuccessfullySaved[40];
-	char SystemDefault[30];
-	char ThemePath[20];
-	char ThemepathChanged[30];
-	char Themepathchange[30];
-	char Titlestxtpath[40];
-	char Titlestxtpathchange[40];
-	char TitlestxtpathChanged[40];
-	char Try[20];
-	char Tooltips[15];
-	char Timeleft[15];
-	char Unlock[20];
-	char Unicodefix[20];
-	char Uninstall[15];
-	char USBLoaderisprotected[40];
-	char USBDevicenotfound[40];
-	char VideoMode[15];
-	char VIDTVPatch[15];
-	char Volume[15];
-	char Waiting[15];
-	char WaitingforUSBDevice[40];
-	char WidescreenFix[40];
-	char WiiMenu[15];
-	char WrongPassword[30];
+	char secondsleft[50];
+	char SelectthePartition[50];
+	char youwanttoformat[50];
+	char settings[50];
+	char ShutdowntoIdle[50];
+	char ShutdownSystem[50];
+	char Success[30];
+	char Successfullyinstalled[80];
+	char Successfullydeleted[60];
+	char SuccessfullySaved[50];
+	char SystemDefault[50];
+	char ThemePath[50];
+	char ThemepathChanged[50];
+	char Themepathchange[80];
+	char Titlestxtpath[80];
+	char Titlestxtpathchange[80];
+	char TitlestxtpathChanged[80];
+	char Try[30];
+	char Tooltips[50];
+	char Timeleft[50];
+	char Unlock[50];
+	char Unicodefix[50];
+	char Uninstall[50];
+	char USBLoaderisprotected[80];
+	char USBDevicenotfound[80];
+	char VideoMode[50];
+	char VIDTVPatch[50];
+	char Volume[50];
+	char Waiting[50];
+	char WaitingforUSBDevice[80];
+	char WidescreenFix[50];
+	char WiiMenu[50];
+	char WrongPassword[50];
 	char Yes[20];
-	char YoudonthavecIOS[30];
-	char Japanese[20];
-	char German[20];
-	char English[20];
-	char French[20];
-	char Spanish[20];
-	char Italian[20];
-	char Dutch[20];
-	char SChinese[20];
-	char TChinese[20];
-	char Korean[20];
+	char YoudonthavecIOS[70];
+	char Japanese[30];
+	char German[30];
+	char English[30];
+	char French[30];
+	char Spanish[30];
+	char Italian[30];
+	char Dutch[30];
+	char SChinese[30];
+	char TChinese[30];
+	char Korean[30];
 };
 
 extern struct LANGUAGE LANGUAGE;
diff --git a/source/menu.cpp b/source/menu.cpp
index 6ba4b16d..9b47de97 100644
--- a/source/menu.cpp
+++ b/source/menu.cpp
@@ -3078,10 +3078,10 @@ static int MenuDiscList()
 				{
 					wiilight(0);
 										//enter new game title
-					char entered[40];
+					char entered[60];
 					snprintf(entered, sizeof(entered), "%s", get_title(header));
-					entered[39] = '\0';
-					int result = OnScreenKeyboard(entered, 40,0);
+					entered[59] = '\0';
+					int result = OnScreenKeyboard(entered, 60,0);
 					if (result == 1) {
 					WBFS_RenameGame(header->id, entered);
 					__Menu_GetEntries();