diff --git a/HBC/META.XML b/HBC/META.XML
index 9132690a..48420c27 100644
--- a/HBC/META.XML
+++ b/HBC/META.XML
@@ -2,8 +2,8 @@
 	<app version="1">
 		<name> USB Loader GX</name>
 		<coder>USB Loader GX Team</coder>
-		<version>2.0 r1073</version>
-		<release_date>201102141852</release_date>
+		<version>2.0 r1074</version>
+		<release_date>201102211941</release_date>
 		<no_ios_reload/>
 		<short_description>Loads games from USB-devices</short_description>
 		<long_description>USB Loader GX is a libwiigui based USB iso loader with a wii-like GUI. You can install games to your HDDs and boot them with shorter loading times.
diff --git a/gui.pnproj b/gui.pnproj
index 8dfb6431..a4fb6f18 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="banner" path="banner\"><File path="OpeningBNR.cpp"></File><File path="OpeningBNR.hpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="BoxCover" path="BoxCover\"><File path="BoxCover.cpp"></File><File path="BoxCover.hpp"></File><File path="BoxMesh.cpp"></File><File path="BoxMesh.hpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="cheats" path="cheats\"><File path="cheatmenu.cpp"></File><File path="cheatmenu.h"></File><File path="gct.cpp"></File><File path="gct.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="Controls" path="Controls\"><File path="DeviceHandler.cpp"></File><File path="DeviceHandler.hpp"></File><File path="PartitionHandle.cpp"></File><File path="PartitionHandle.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="FileOperations" path="FileOperations\"><File path="DirList.cpp"></File><File path="DirList.h"></File><File path="File.cpp"></File><File path="File.hpp"></File><File path="fileops.cpp"></File><File path="fileops.h"></File></MagicFolder><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="homebrewboot" path="homebrewboot\"><File path="BootHomebrew.cpp"></File><File path="BootHomebrew.h"></File><File path="dolloader.c"></File><File path="dolloader.h"></File><File path="HomebrewBrowse.cpp"></File><File path="HomebrewBrowse.h"></File><File path="HomebrewBrowser.cpp"></File><File path="HomebrewBrowser.hpp"></File><File path="HomebrewXML.cpp"></File><File path="HomebrewXML.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="ImageOperations" path="ImageOperations\"><File path="TextureConverter.c"></File><File path="TextureConverter.h"></File><File path="TplImage.cpp"></File><File path="TplImage.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="images" path="images\"><File path="abcIcon.png"></File><File path="addressbar_textbox.png"></File><File path="arrangeCarousel.png"></File><File path="arrangeCarousel_gray.png"></File><File path="arrangeGrid.png"></File><File path="arrangeGrid_gray.png"></File><File path="arrangeList.png"></File><File path="arrangeList_gray.png"></File><File path="background.png"></File><File path="balanceboard.png"></File><File path="balanceboardR.png"></File><File path="battery.png"></File><File path="battery_bar.png"></File><File path="battery_bar_red.png"></File><File path="battery_bar_white.png"></File><File path="battery_red.png"></File><File path="battery_white.png"></File><File path="bg_browser.png"></File><File path="bg_browser_selection.png"></File><File path="bg_options.png"></File><File path="bg_options_entry.png"></File><File path="bg_options_settings.png"></File><File path="boxBorder.png"></File><File path="browser.png"></File><File path="browser_over.png"></File><File path="button_dialogue_box.png"></File><File path="button_install.png"></File><File path="button_install_over.png"></File><File path="cero_a.png"></File><File path="cero_b.png"></File><File path="cero_c.png"></File><File path="cero_d.png"></File><File path="cero_z.png"></File><File path="Channel_btn.png"></File><File path="classiccontroller.png"></File><File path="classiccontrollerR.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="dancepad.png"></File><File path="dancepadR.png"></File><File path="dialogue_box.png"></File><File path="dialogue_box_startgame.png"></File><File path="drums.png"></File><File path="drumsR.png"></File><File path="dvd.png"></File><File path="dvd_gray.png"></File><File path="esrb_ao.png"></File><File path="esrb_e.png"></File><File path="esrb_ec.png"></File><File path="esrb_eten.png"></File><File path="esrb_m.png"></File><File path="esrb_t.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="favIcon.png"></File><File path="favIcon_gray.png"></File><File path="favorite.png"></File><File path="gameinfo1.png"></File><File path="gameinfo1a.png"></File><File path="gameinfo2.png"></File><File path="gameinfo2a.png"></File><File path="gcncontroller.png"></File><File path="gcncontrollerR.png"></File><File path="guitar.png"></File><File path="guitarR.png"></File><File path="gxlogo.png"></File><File path="icon_folder.png"></File><File path="keyboard_backspace_over.png"></File><File path="keyboard_clear_over.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="lock.png"></File><File path="lock_gray.png"></File><File path="menu_button.png"></File><File path="menu_button_over.png"></File><File path="microphone.png"></File><File path="microphoneR.png"></File><File path="motionplus.png"></File><File path="motionplusR.png"></File><File path="new.png"></File><File path="nintendods.png"></File><File path="nintendodsR.png"></File><File path="nocover.png"></File><File path="nocoverFlat.png"></File><File path="nocoverFull.png"></File><File path="nodisc.png"></File><File path="norating.png"></File><File path="not_favorite.png"></File><File path="nunchuk.png"></File><File path="nunchukR.png"></File><File path="pageindicator.png"></File><File path="pegi_12.png"></File><File path="pegi_16.png"></File><File path="pegi_18.png"></File><File path="pegi_3.png"></File><File path="pegi_7.png"></File><File path="playCountIcon.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="playersSort.png"></File><File path="progressbar.png"></File><File path="progressbar_empty.png"></File><File path="progressbar_outline.png"></File><File path="rankIcon.png"></File><File path="rplayer1_point.png"></File><File path="rplayer2_point.png"></File><File path="rplayer3_point.png"></File><File path="rplayer4_point.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="sdcard_over.png"></File><File path="searchIcon.png"></File><File path="searchIcon_gray.png"></File><File path="settings_background.png"></File><File path="settings_button.png"></File><File path="settings_button_over.png"></File><File path="settings_title.png"></File><File path="settings_title_over.png"></File><File path="startgame_arrow_left.png"></File><File path="startgame_arrow_right.png"></File><File path="theme_box.png"></File><File path="theme_dialogue_box.png"></File><File path="tooltip_left.png"></File><File path="tooltip_right.png"></File><File path="tooltip_tile.png"></File><File path="unlock.png"></File><File path="unlock_gray.png"></File><File path="usbport.png"></File><File path="wbackground.png"></File><File path="wdialogue_box_startgame.png"></File><File path="wheel.png"></File><File path="wheelR.png"></File><File path="wifi1.png"></File><File path="wifi12.png"></File><File path="wifi16.png"></File><File path="wifi2.png"></File><File path="wifi3.png"></File><File path="wifi32.png"></File><File path="wifi4.png"></File><File path="wifi8.png"></File><File path="Wifi_btn.png"></File><File path="wiimote.png"></File><File path="Wiimote1.png"></File><File path="Wiimote2.png"></File><File path="Wiimote3.png"></File><File path="Wiimote4.png"></File><File path="wiimote_poweroff.png"></File><File path="wiimote_poweroff_over.png"></File><File path="wiispeak.png"></File><File path="wiispeakR.png"></File><File path="zapper.png"></File><File path="zapperR.png"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="language" path="language\"><File path="gettext.c"></File><File path="gettext.h"></File><File path="UpdateLanguage.cpp"></File><File path="UpdateLanguage.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libs" path="libs\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libext2fs" path="libext2fs\"><File path="ext2_frag.h"></File><File path="libcustomext2fs.a"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libfat" path="libfat\"><File path="fatfile_frag.h"></File><File path="libcustomfat.a"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libntfs" path="libntfs\"><File path="libcustomntfs.a"></File><File path="ntfsfile_frag.h"></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><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libwiigui" path="libwiigui\"><File path="gui.h"></File><File path="gui_box.cpp"></File><File path="gui_box.hpp"></File><File path="gui_button.cpp"></File><File path="gui_checkbox.cpp"></File><File path="gui_checkbox.hpp"></File><File path="gui_circle.cpp"></File><File path="gui_circle.hpp"></File><File path="gui_cross.cpp"></File><File path="gui_cross.hpp"></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_filebrowser.cpp"></File><File path="gui_gamebrowser.cpp"></File><File path="gui_gamebrowser.h"></File><File path="gui_gamecarousel.cpp"></File><File path="gui_gamecarousel.h"></File><File path="gui_gamegrid.cpp"></File><File path="gui_gamegrid.h"></File><File path="gui_image.cpp"></File><File path="gui_imagedata.cpp"></File><File path="gui_imagedata.h"></File><File path="gui_image_async.cpp"></File><File path="gui_image_async.h"></File><File path="gui_keyboard.cpp"></File><File path="gui_numpad.cpp"></File><File path="gui_optionbrowser.cpp"></File><File path="gui_searchbar.cpp"></File><File path="gui_searchbar.h"></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><File path="LoadCoverImage.cpp"></File><File path="LoadCoverImage.h"></File><File path="OptionList.cpp"></File><File path="OptionList.hpp"></File><File path="Text.cpp"></File><File path="Text.hpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="memory" path="memory\"><File path="mem2.cpp"></File><File path="mem2.h"></File><File path="mem2alloc.cpp"></File><File path="mem2alloc.hpp"></File><File path="memory.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="menu" path="menu\"><File path="GameBrowseMenu.cpp"></File><File path="GameBrowseMenu.hpp"></File><File path="menus.h"></File><File path="menu_install.cpp"></File><File path="menu_partition_selection.cpp"></File><File path="WDMMenu.cpp"></File><File path="WDMMenu.hpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="mload" path="mload\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="modules" path="modules\"><File path="dip_plugin_249.c"></File><File path="dip_plugin_249.h"></File><File path="ehcmodule_5.c"></File><File path="ehcmodule_5.h"></File><File path="odip_frag.c"></File><File path="odip_frag.h"></File></MagicFolder><File path="mload.c"></File><File path="mload.h"></File><File path="mload_modules.c"></File><File path="mload_modules.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="network" path="network\"><File path="dns.c"></File><File path="dns.h"></File><File path="FileDownloader.cpp"></File><File path="FileDownloader.h"></File><File path="HTML_Stream.cpp"></File><File path="HTML_Stream.h"></File><File path="http.c"></File><File path="http.h"></File><File path="ImageDownloader.cpp"></File><File path="ImageDownloader.h"></File><File path="networkops.cpp"></File><File path="networkops.h"></File><File path="update.cpp"></File><File path="update.h"></File><File path="URL_List.cpp"></File><File path="URL_List.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="patches" path="patches\"><File path="codehandler.h"></File><File path="codehandleronly.h"></File><File path="dolpatcher.c"></File><File path="dolpatcher.h"></File><File path="dvd_broadway.c"></File><File path="dvd_broadway.h"></File><File path="fst.c"></File><File path="fst.h"></File><File path="fwrite_patch.h"></File><File path="gamepatches.c"></File><File path="gamepatches.h"></File><File path="geckomenu.h"></File><File path="kenobiwii.h"></File><File path="multidol.c"></File><File path="multidol.h"></File><File path="patchcode.c"></File><File path="patchcode.h"></File><File path="patchhook.S"></File><File path="ppc.h"></File><File path="wip.cpp"></File><File path="wip.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="prompts" path="prompts\"><File path="CheckboxPrompt.cpp"></File><File path="CheckboxPrompt.hpp"></File><File path="DiscBrowser.cpp"></File><File path="DiscBrowser.h"></File><File path="filebrowser.cpp"></File><File path="filebrowser.h"></File><File path="gameinfo.cpp"></File><File path="gameinfo.h"></File><File path="GameWindow.cpp"></File><File path="GameWindow.hpp"></File><File path="ProgressWindow.cpp"></File><File path="ProgressWindow.h"></File><File path="PromptWindow.cpp"></File><File path="PromptWindow.hpp"></File><File path="PromptWindows.cpp"></File><File path="PromptWindows.h"></File><File path="TitleBrowser.cpp"></File><File path="TitleBrowser.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="settings" path="settings\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="menus" path="menus\"><File path="CustomPathsSM.cpp"></File><File path="CustomPathsSM.hpp"></File><File path="FlyingButtonsMenu.cpp"></File><File path="FlyingButtonsMenu.hpp"></File><File path="GameLoadSM.cpp"></File><File path="GameLoadSM.hpp"></File><File path="GameSettingsMenu.cpp"></File><File path="GameSettingsMenu.hpp"></File><File path="GlobalSettings.cpp"></File><File path="GlobalSettings.hpp"></File><File path="GUISettingsMenu.cpp"></File><File path="GUISettingsMenu.hpp"></File><File path="LoaderSettings.cpp"></File><File path="LoaderSettings.hpp"></File><File path="ParentalControlSM.cpp"></File><File path="ParentalControlSM.hpp"></File><File path="SettingsMenu.cpp"></File><File path="SettingsMenu.hpp"></File><File path="SoundSettingsMenu.cpp"></File><File path="SoundSettingsMenu.hpp"></File><File path="UninstallSM.cpp"></File><File path="UninstallSM.hpp"></File></MagicFolder><File path="CGameSettings.cpp"></File><File path="CGameSettings.h"></File><File path="CGameStatistics.cpp"></File><File path="CGameStatistics.h"></File><File path="CSettings.cpp"></File><File path="CSettings.h"></File><File path="GameTitles.cpp"></File><File path="GameTitles.h"></File><File path="newtitles.cpp"></File><File path="newtitles.h"></File><File path="Settings.cpp"></File><File path="Settings.h"></File><File path="SettingsEnums.h"></File><File path="SettingsPrompts.cpp"></File><File path="SettingsPrompts.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="SoundOperations" path="SoundOperations\"><File path="AifDecoder.cpp"></File><File path="AifDecoder.hpp"></File><File path="BNSDecoder.cpp"></File><File path="BNSDecoder.hpp"></File><File path="BufferCircle.cpp"></File><File path="BufferCircle.hpp"></File><File path="gui_bgm.cpp"></File><File path="gui_bgm.h"></File><File path="gui_sound.cpp"></File><File path="gui_sound.h"></File><File path="Mp3Decoder.cpp"></File><File path="Mp3Decoder.hpp"></File><File path="OggDecoder.cpp"></File><File path="OggDecoder.hpp"></File><File path="SoundDecoder.cpp"></File><File path="SoundDecoder.hpp"></File><File path="SoundHandler.cpp"></File><File path="SoundHandler.hpp"></File><File path="WavDecoder.cpp"></File><File path="WavDecoder.hpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="sounds" path="sounds\"><File path="bg_music.ogg"></File><File path="button_click.wav"></File><File path="button_click2.wav"></File><File path="button_over.wav"></File><File path="credits_music.ogg"></File><File path="menuin.ogg"></File><File path="menuout.ogg"></File><File path="success.ogg"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="system" path="system\"><File path="IosLoader.cpp"></File><File path="IosLoader.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="themes" path="themes\"><File path="CTheme.cpp"></File><File path="CTheme.h"></File><File path="gettheme.c"></File><File path="gettheme.h"></File><File path="Resources.cpp"></File><File path="Resources.h"></File><File path="ThemeDownloader.cpp"></File><File path="ThemeDownloader.h"></File><File path="ThemeMenu.cpp"></File><File path="ThemeMenu.h"></File><File path="Theme_List.cpp"></File><File path="Theme_List.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="usbloader" path="usbloader\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="wbfs" path="wbfs\"><File path="wbfs_base.cpp"></File><File path="wbfs_base.h"></File><File path="wbfs_ext.h"></File><File path="wbfs_fat.cpp"></File><File path="wbfs_fat.h"></File><File path="wbfs_ntfs.h"></File><File path="wbfs_rw.c"></File><File path="wbfs_rw.h"></File><File path="wbfs_wbfs.cpp"></File><File path="wbfs_wbfs.h"></File></MagicFolder><File path="alternatedol.c"></File><File path="alternatedol.h"></File><File path="AlternateDOLOffsets.cpp"></File><File path="AlternateDOLOffsets.h"></File><File path="apploader.c"></File><File path="apploader.h"></File><File path="disc.c"></File><File path="disc.h"></File><File path="frag.c"></File><File path="frag.h"></File><File path="fstfile.c"></File><File path="fstfile.h"></File><File path="GameBooter.cpp"></File><File path="GameBooter.hpp"></File><File path="GameList.cpp"></File><File path="GameList.h"></File><File path="GetMissingGameFiles.cpp"></File><File path="GetMissingGameFiles.hpp"></File><File path="MountGamePartition.cpp"></File><File path="MountGamePartition.h"></File><File path="playlog.c"></File><File path="playlog.h"></File><File path="sdhc.c"></File><File path="sdhc.h"></File><File path="splits.c"></File><File path="splits.h"></File><File path="usbstorage2.c"></File><File path="usbstorage2.h"></File><File path="utils.c"></File><File path="utils.h"></File><File path="wbfs.cpp"></File><File path="wbfs.h"></File><File path="WDMFile.cpp"></File><File path="WDMFile.hpp"></File><File path="wdvd.c"></File><File path="wdvd.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="utils" path="utils\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="minizip" path="minizip\"><File path="miniunz.c"></File><File path="miniunz.h"></File></MagicFolder><File path="Callback.hpp"></File><File path="encrypt.c"></File><File path="encrypt.h"></File><File path="MD5.c"></File><File path="MD5.h"></File><File path="PasswordCheck.cpp"></File><File path="PasswordCheck.h"></File><File path="ResourceManager.cpp"></File><File path="ResourceManager.h"></File><File path="rockout.cpp"></File><File path="rockout.h"></File><File path="ShowError.cpp"></File><File path="ShowError.h"></File><File path="StringTools.c"></File><File path="StringTools.h"></File><File path="ThreadedTask.cpp"></File><File path="ThreadedTask.hpp"></File><File path="timer.c"></File><File path="timer.h"></File><File path="tools.h"></File><File path="uncompress.c"></File><File path="uncompress.h"></File><File path="wifi_gecko.c"></File><File path="wifi_gecko.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="wad" path="wad\"><File path="nandtitle.cpp"></File><File path="nandtitle.h"></File><File path="utils.h"></File><File path="wad.cpp"></File><File path="wad.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="xml" path="xml\"><File path="WiiTDB.cpp"></File><File path="WiiTDB.hpp"></File><File path="xml.cpp"></File><File path="xml.h"></File></MagicFolder><File path="audio.cpp"></File><File path="audio.h"></File><File path="filelist.h"></File><File path="FreeTypeGX.cpp"></File><File path="FreeTypeGX.h"></File><File path="gecko.c"></File><File path="gecko.h"></File><File path="input.cpp"></File><File path="input.h"></File><File path="lstub.cpp"></File><File path="lstub.h"></File><File path="main.cpp"></File><File path="main.h"></File><File path="menu.cpp"></File><File path="menu.h"></File><File path="StartUpProcess.cpp"></File><File path="StartUpProcess.h"></File><File path="svnrev.c"></File><File path="svnrev.h"></File><File path="sys.cpp"></File><File path="sys.h"></File><File path="video.cpp"></File><File path="video.h"></File><File path="wpad.c"></File><File path="wpad.h"></File><File path="wstring.cpp"></File><File path="wstring.hpp"></File><File path="ZipFile.cpp"></File><File path="ZipFile.h"></File></MagicFolder><File path="Makefile"></File></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="banner" path="banner\"><File path="OpeningBNR.cpp"></File><File path="OpeningBNR.hpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="BoxCover" path="BoxCover\"><File path="BoxCover.cpp"></File><File path="BoxCover.hpp"></File><File path="BoxMesh.cpp"></File><File path="BoxMesh.hpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="cheats" path="cheats\"><File path="cheatmenu.cpp"></File><File path="cheatmenu.h"></File><File path="gct.cpp"></File><File path="gct.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="Controls" path="Controls\"><File path="DeviceHandler.cpp"></File><File path="DeviceHandler.hpp"></File><File path="PartitionHandle.cpp"></File><File path="PartitionHandle.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="FileOperations" path="FileOperations\"><File path="DirList.cpp"></File><File path="DirList.h"></File><File path="File.cpp"></File><File path="File.hpp"></File><File path="fileops.cpp"></File><File path="fileops.h"></File></MagicFolder><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="homebrewboot" path="homebrewboot\"><File path="BootHomebrew.cpp"></File><File path="BootHomebrew.h"></File><File path="dolloader.c"></File><File path="dolloader.h"></File><File path="HomebrewBrowse.cpp"></File><File path="HomebrewBrowse.h"></File><File path="HomebrewBrowser.cpp"></File><File path="HomebrewBrowser.hpp"></File><File path="HomebrewXML.cpp"></File><File path="HomebrewXML.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="ImageOperations" path="ImageOperations\"><File path="TextureConverter.c"></File><File path="TextureConverter.h"></File><File path="TplImage.cpp"></File><File path="TplImage.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="images" path="images\"><File path="abcIcon.png"></File><File path="addressbar_textbox.png"></File><File path="arrangeCarousel.png"></File><File path="arrangeCarousel_gray.png"></File><File path="arrangeGrid.png"></File><File path="arrangeGrid_gray.png"></File><File path="arrangeList.png"></File><File path="arrangeList_gray.png"></File><File path="background.png"></File><File path="balanceboard.png"></File><File path="balanceboardR.png"></File><File path="battery.png"></File><File path="battery_bar.png"></File><File path="battery_bar_red.png"></File><File path="battery_bar_white.png"></File><File path="battery_red.png"></File><File path="battery_white.png"></File><File path="bg_browser.png"></File><File path="bg_browser_selection.png"></File><File path="bg_options.png"></File><File path="bg_options_entry.png"></File><File path="bg_options_settings.png"></File><File path="boxBorder.png"></File><File path="browser.png"></File><File path="browser_over.png"></File><File path="button_dialogue_box.png"></File><File path="button_install.png"></File><File path="button_install_over.png"></File><File path="cero_a.png"></File><File path="cero_b.png"></File><File path="cero_c.png"></File><File path="cero_d.png"></File><File path="cero_z.png"></File><File path="Channel_btn.png"></File><File path="classiccontroller.png"></File><File path="classiccontrollerR.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="dancepad.png"></File><File path="dancepadR.png"></File><File path="dialogue_box.png"></File><File path="dialogue_box_startgame.png"></File><File path="drums.png"></File><File path="drumsR.png"></File><File path="dvd.png"></File><File path="dvd_gray.png"></File><File path="esrb_ao.png"></File><File path="esrb_e.png"></File><File path="esrb_ec.png"></File><File path="esrb_eten.png"></File><File path="esrb_m.png"></File><File path="esrb_t.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="favIcon.png"></File><File path="favIcon_gray.png"></File><File path="favorite.png"></File><File path="gameinfo1.png"></File><File path="gameinfo1a.png"></File><File path="gameinfo2.png"></File><File path="gameinfo2a.png"></File><File path="gcncontroller.png"></File><File path="gcncontrollerR.png"></File><File path="guitar.png"></File><File path="guitarR.png"></File><File path="gxlogo.png"></File><File path="icon_folder.png"></File><File path="keyboard_backspace_over.png"></File><File path="keyboard_clear_over.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="lock.png"></File><File path="lock_gray.png"></File><File path="menu_button.png"></File><File path="menu_button_over.png"></File><File path="microphone.png"></File><File path="microphoneR.png"></File><File path="motionplus.png"></File><File path="motionplusR.png"></File><File path="new.png"></File><File path="nintendods.png"></File><File path="nintendodsR.png"></File><File path="nocover.png"></File><File path="nocoverFlat.png"></File><File path="nocoverFull.png"></File><File path="nodisc.png"></File><File path="norating.png"></File><File path="not_favorite.png"></File><File path="nunchuk.png"></File><File path="nunchukR.png"></File><File path="pageindicator.png"></File><File path="pegi_12.png"></File><File path="pegi_16.png"></File><File path="pegi_18.png"></File><File path="pegi_3.png"></File><File path="pegi_7.png"></File><File path="playCountIcon.png"></File><File path="player1_grab.png"></File><File path="player1_point.png"></File><File path="player2_grab.png"></File><File path="player2_point.png"></File><File path="player3_grab.png"></File><File path="player3_point.png"></File><File path="player4_grab.png"></File><File path="player4_point.png"></File><File path="playersSort.png"></File><File path="progressbar.png"></File><File path="progressbar_empty.png"></File><File path="progressbar_outline.png"></File><File path="rankIcon.png"></File><File path="rplayer1_point.png"></File><File path="rplayer2_point.png"></File><File path="rplayer3_point.png"></File><File path="rplayer4_point.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="sdcard_over.png"></File><File path="searchIcon.png"></File><File path="searchIcon_gray.png"></File><File path="settings_background.png"></File><File path="settings_button.png"></File><File path="settings_button_over.png"></File><File path="settings_title.png"></File><File path="settings_title_over.png"></File><File path="startgame_arrow_left.png"></File><File path="startgame_arrow_right.png"></File><File path="theme_box.png"></File><File path="theme_dialogue_box.png"></File><File path="tooltip_left.png"></File><File path="tooltip_right.png"></File><File path="tooltip_tile.png"></File><File path="unlock.png"></File><File path="unlock_gray.png"></File><File path="usbport.png"></File><File path="wbackground.png"></File><File path="wdialogue_box_startgame.png"></File><File path="wheel.png"></File><File path="wheelR.png"></File><File path="wifi1.png"></File><File path="wifi12.png"></File><File path="wifi16.png"></File><File path="wifi2.png"></File><File path="wifi3.png"></File><File path="wifi32.png"></File><File path="wifi4.png"></File><File path="wifi8.png"></File><File path="Wifi_btn.png"></File><File path="wiimote.png"></File><File path="Wiimote1.png"></File><File path="Wiimote2.png"></File><File path="Wiimote3.png"></File><File path="Wiimote4.png"></File><File path="wiimote_poweroff.png"></File><File path="wiimote_poweroff_over.png"></File><File path="wiispeak.png"></File><File path="wiispeakR.png"></File><File path="zapper.png"></File><File path="zapperR.png"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="language" path="language\"><File path="gettext.c"></File><File path="gettext.h"></File><File path="UpdateLanguage.cpp"></File><File path="UpdateLanguage.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libs" path="libs\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libext2fs" path="libext2fs\"><File path="ext2_frag.h"></File><File path="libcustomext2fs.a"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libfat" path="libfat\"><File path="fatfile_frag.h"></File><File path="libcustomfat.a"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libntfs" path="libntfs\"><File path="libcustomntfs.a"></File><File path="ntfsfile_frag.h"></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><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libwiigui" path="libwiigui\"><File path="gui.h"></File><File path="gui_box.cpp"></File><File path="gui_box.hpp"></File><File path="gui_button.cpp"></File><File path="gui_checkbox.cpp"></File><File path="gui_checkbox.hpp"></File><File path="gui_circle.cpp"></File><File path="gui_circle.hpp"></File><File path="gui_cross.cpp"></File><File path="gui_cross.hpp"></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_filebrowser.cpp"></File><File path="gui_gamebrowser.cpp"></File><File path="gui_gamebrowser.h"></File><File path="gui_gamecarousel.cpp"></File><File path="gui_gamecarousel.h"></File><File path="gui_gamegrid.cpp"></File><File path="gui_gamegrid.h"></File><File path="gui_image.cpp"></File><File path="gui_imagedata.cpp"></File><File path="gui_imagedata.h"></File><File path="gui_image_async.cpp"></File><File path="gui_image_async.h"></File><File path="gui_keyboard.cpp"></File><File path="gui_numpad.cpp"></File><File path="gui_optionbrowser.cpp"></File><File path="gui_searchbar.cpp"></File><File path="gui_searchbar.h"></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><File path="LoadCoverImage.cpp"></File><File path="LoadCoverImage.h"></File><File path="OptionList.cpp"></File><File path="OptionList.hpp"></File><File path="Text.cpp"></File><File path="Text.hpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="memory" path="memory\"><File path="mem2.cpp"></File><File path="mem2.h"></File><File path="mem2alloc.cpp"></File><File path="mem2alloc.hpp"></File><File path="memory.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="menu" path="menu\"><File path="GameBrowseMenu.cpp"></File><File path="GameBrowseMenu.hpp"></File><File path="menus.h"></File><File path="menu_install.cpp"></File><File path="menu_partition_selection.cpp"></File><File path="WDMMenu.cpp"></File><File path="WDMMenu.hpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="mload" path="mload\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="modules" path="modules\"><File path="dip_plugin_249.c"></File><File path="dip_plugin_249.h"></File><File path="ehcmodule_5.c"></File><File path="ehcmodule_5.h"></File><File path="odip_frag.c"></File><File path="odip_frag.h"></File></MagicFolder><File path="mload.c"></File><File path="mload.h"></File><File path="mload_modules.c"></File><File path="mload_modules.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="network" path="network\"><File path="dns.c"></File><File path="dns.h"></File><File path="FileDownloader.cpp"></File><File path="FileDownloader.h"></File><File path="HTML_Stream.cpp"></File><File path="HTML_Stream.h"></File><File path="http.c"></File><File path="http.h"></File><File path="ImageDownloader.cpp"></File><File path="ImageDownloader.h"></File><File path="networkops.cpp"></File><File path="networkops.h"></File><File path="update.cpp"></File><File path="update.h"></File><File path="URL_List.cpp"></File><File path="URL_List.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="patches" path="patches\"><File path="codehandler.h"></File><File path="codehandleronly.h"></File><File path="dolpatcher.c"></File><File path="dolpatcher.h"></File><File path="dvd_broadway.c"></File><File path="dvd_broadway.h"></File><File path="fst.c"></File><File path="fst.h"></File><File path="fwrite_patch.h"></File><File path="gamepatches.c"></File><File path="gamepatches.h"></File><File path="geckomenu.h"></File><File path="kenobiwii.h"></File><File path="multidol.c"></File><File path="multidol.h"></File><File path="patchcode.c"></File><File path="patchcode.h"></File><File path="patchhook.S"></File><File path="ppc.h"></File><File path="wip.cpp"></File><File path="wip.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="prompts" path="prompts\"><File path="CheckboxPrompt.cpp"></File><File path="CheckboxPrompt.hpp"></File><File path="DiscBrowser.cpp"></File><File path="DiscBrowser.h"></File><File path="filebrowser.cpp"></File><File path="filebrowser.h"></File><File path="gameinfo.cpp"></File><File path="gameinfo.h"></File><File path="GameWindow.cpp"></File><File path="GameWindow.hpp"></File><File path="ProgressWindow.cpp"></File><File path="ProgressWindow.h"></File><File path="PromptWindow.cpp"></File><File path="PromptWindow.hpp"></File><File path="PromptWindows.cpp"></File><File path="PromptWindows.h"></File><File path="TitleBrowser.cpp"></File><File path="TitleBrowser.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="settings" path="settings\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="menus" path="menus\"><File path="CustomPathsSM.cpp"></File><File path="CustomPathsSM.hpp"></File><File path="FlyingButtonsMenu.cpp"></File><File path="FlyingButtonsMenu.hpp"></File><File path="GameLoadSM.cpp"></File><File path="GameLoadSM.hpp"></File><File path="GameSettingsMenu.cpp"></File><File path="GameSettingsMenu.hpp"></File><File path="GlobalSettings.cpp"></File><File path="GlobalSettings.hpp"></File><File path="GUISettingsMenu.cpp"></File><File path="GUISettingsMenu.hpp"></File><File path="LoaderSettings.cpp"></File><File path="LoaderSettings.hpp"></File><File path="ParentalControlSM.cpp"></File><File path="ParentalControlSM.hpp"></File><File path="SettingsMenu.cpp"></File><File path="SettingsMenu.hpp"></File><File path="SoundSettingsMenu.cpp"></File><File path="SoundSettingsMenu.hpp"></File><File path="UninstallSM.cpp"></File><File path="UninstallSM.hpp"></File></MagicFolder><File path="CGameSettings.cpp"></File><File path="CGameSettings.h"></File><File path="CGameStatistics.cpp"></File><File path="CGameStatistics.h"></File><File path="CSettings.cpp"></File><File path="CSettings.h"></File><File path="GameTitles.cpp"></File><File path="GameTitles.h"></File><File path="newtitles.cpp"></File><File path="newtitles.h"></File><File path="Settings.cpp"></File><File path="Settings.h"></File><File path="SettingsEnums.h"></File><File path="SettingsPrompts.cpp"></File><File path="SettingsPrompts.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="SoundOperations" path="SoundOperations\"><File path="AifDecoder.cpp"></File><File path="AifDecoder.hpp"></File><File path="BNSDecoder.cpp"></File><File path="BNSDecoder.hpp"></File><File path="BufferCircle.cpp"></File><File path="BufferCircle.hpp"></File><File path="gui_bgm.cpp"></File><File path="gui_bgm.h"></File><File path="gui_sound.cpp"></File><File path="gui_sound.h"></File><File path="Mp3Decoder.cpp"></File><File path="Mp3Decoder.hpp"></File><File path="OggDecoder.cpp"></File><File path="OggDecoder.hpp"></File><File path="SoundDecoder.cpp"></File><File path="SoundDecoder.hpp"></File><File path="SoundHandler.cpp"></File><File path="SoundHandler.hpp"></File><File path="WavDecoder.cpp"></File><File path="WavDecoder.hpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="sounds" path="sounds\"><File path="bg_music.ogg"></File><File path="button_click.wav"></File><File path="button_click2.wav"></File><File path="button_over.wav"></File><File path="credits_music.ogg"></File><File path="menuin.ogg"></File><File path="menuout.ogg"></File><File path="success.ogg"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="system" path="system\"><File path="IosLoader.cpp"></File><File path="IosLoader.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="themes" path="themes\"><File path="CTheme.cpp"></File><File path="CTheme.h"></File><File path="gettheme.c"></File><File path="gettheme.h"></File><File path="Resources.cpp"></File><File path="Resources.h"></File><File path="ThemeDownloader.cpp"></File><File path="ThemeDownloader.h"></File><File path="ThemeMenu.cpp"></File><File path="ThemeMenu.h"></File><File path="Theme_List.cpp"></File><File path="Theme_List.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="usbloader" path="usbloader\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="wbfs" path="wbfs\"><File path="wbfs_base.cpp"></File><File path="wbfs_base.h"></File><File path="wbfs_ext.h"></File><File path="wbfs_fat.cpp"></File><File path="wbfs_fat.h"></File><File path="wbfs_ntfs.h"></File><File path="wbfs_rw.c"></File><File path="wbfs_rw.h"></File><File path="wbfs_wbfs.cpp"></File><File path="wbfs_wbfs.h"></File></MagicFolder><File path="alternatedol.c"></File><File path="alternatedol.h"></File><File path="AlternateDOLOffsets.cpp"></File><File path="AlternateDOLOffsets.h"></File><File path="apploader.c"></File><File path="apploader.h"></File><File path="disc.c"></File><File path="disc.h"></File><File path="frag.c"></File><File path="frag.h"></File><File path="fstfile.c"></File><File path="fstfile.h"></File><File path="GameBooter.cpp"></File><File path="GameBooter.hpp"></File><File path="GameList.cpp"></File><File path="GameList.h"></File><File path="GetMissingGameFiles.cpp"></File><File path="GetMissingGameFiles.hpp"></File><File path="MountGamePartition.cpp"></File><File path="MountGamePartition.h"></File><File path="playlog.c"></File><File path="playlog.h"></File><File path="sdhc.c"></File><File path="sdhc.h"></File><File path="splits.c"></File><File path="splits.h"></File><File path="usbstorage2.c"></File><File path="usbstorage2.h"></File><File path="utils.c"></File><File path="utils.h"></File><File path="wbfs.cpp"></File><File path="wbfs.h"></File><File path="WDMFile.cpp"></File><File path="WDMFile.hpp"></File><File path="wdvd.c"></File><File path="wdvd.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="utils" path="utils\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="minizip" path="minizip\"><File path="miniunz.c"></File><File path="miniunz.h"></File></MagicFolder><File path="Callback.hpp"></File><File path="encrypt.c"></File><File path="encrypt.h"></File><File path="MD5.c"></File><File path="MD5.h"></File><File path="PasswordCheck.cpp"></File><File path="PasswordCheck.h"></File><File path="ResourceManager.cpp"></File><File path="ResourceManager.h"></File><File path="rockout.cpp"></File><File path="rockout.h"></File><File path="ShowError.cpp"></File><File path="ShowError.h"></File><File path="StringTools.c"></File><File path="StringTools.h"></File><File path="ThreadedTask.cpp"></File><File path="ThreadedTask.hpp"></File><File path="timer.c"></File><File path="timer.h"></File><File path="tools.h"></File><File path="uncompress.c"></File><File path="uncompress.h"></File><File path="wifi_gecko.c"></File><File path="wifi_gecko.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="wad" path="wad\"><File path="nandtitle.cpp"></File><File path="nandtitle.h"></File><File path="utils.h"></File><File path="wad.cpp"></File><File path="wad.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="xml" path="xml\"><File path="WiiTDB.cpp"></File><File path="WiiTDB.hpp"></File><File path="xml.cpp"></File><File path="xml.h"></File></MagicFolder><File path="audio.cpp"></File><File path="audio.h"></File><File path="filelist.h"></File><File path="FreeTypeGX.cpp"></File><File path="FreeTypeGX.h"></File><File path="gecko.c"></File><File path="gecko.h"></File><File path="input.cpp"></File><File path="input.h"></File><File path="lstub.cpp"></File><File path="lstub.h"></File><File path="main.cpp"></File><File path="main.h"></File><File path="menu.cpp"></File><File path="menu.h"></File><File path="StartUpProcess.cpp"></File><File path="StartUpProcess.h"></File><File path="svnrev.c"></File><File path="svnrev.h"></File><File path="sys.cpp"></File><File path="sys.h"></File><File path="video.cpp"></File><File path="video.h"></File><File path="wpad.c"></File><File path="wpad.h"></File><File path="wstring.cpp"></File><File path="wstring.hpp"></File><File path="ZipFile.cpp"></File><File path="ZipFile.h"></File></MagicFolder><File path="Makefile"></File></Project>
\ No newline at end of file
diff --git a/source/BoxCover/BoxCover.cpp b/source/BoxCover/BoxCover.cpp
index 2650394c..76b6c2d6 100644
--- a/source/BoxCover/BoxCover.cpp
+++ b/source/BoxCover/BoxCover.cpp
@@ -23,6 +23,7 @@
  ***************************************************************************/
 #include "BoxCover.hpp"
 #include "BoxMesh.hpp"
+#include "settings/CSettings.h"
 #include "themes/CTheme.h"
 
 extern GuiImageData * pointer[4];
@@ -47,12 +48,13 @@ BoxCover::BoxCover(GuiImageData * img, bool flat)
     PosZ = -27.f;
     AnimRotate = 0.0f;
     last_manual_move_frame = 0;
-    camera = (guVector) {0.0F, 0.0F, 0.0F};
-    up = (guVector) {0.0F, 1.0F, 0.0F};
-    look = (guVector) {0.0F, 0.0F, -1.0F};
+    guVector camera = (guVector) {0.0F, 0.0F, 0.0F};
+    guVector up = (guVector) {0.0F, 1.0F, 0.0F};
+    guVector look = (guVector) {0.0F, 0.0F, -1.0F};
     boxColor = (GXColor) {233, 233, 233, 255};
 
     guLookAt(view, &camera,	&up, &look);
+    guPerspective(projection, 8, 640.f/480.f, 1.0f, 300.0F);
 
     //! Remove me later
     for(int i = 0; i < 4; ++i)
@@ -110,7 +112,7 @@ void BoxCover::WiiPADControl(GuiTrigger *t)
         else
             moveChan = -1;
     }
-    else if((t->wpad.btns_h & WPAD_BUTTON_A) && moveChan == t->chan && t->wpad.ir.valid)
+    else if((t->wpad.btns_h & WPAD_BUTTON_A) && moveChan == t->chan && t->wpad.ir.valid && !effects)
     {
         movePosX = (t->wpad.ir.x-moveStartPosX) * fabs(PosZ)/3400.f;
         movePosY = (moveStartPosY-t->wpad.ir.y) * fabs(PosZ)/3400.f;
@@ -194,8 +196,6 @@ void BoxCover::Draw()
 {
     u8 BoxAlpha = (int) (alpha+angleDyn) & 0xFF;
 
-    Mtx44 projection;
-    guPerspective(projection, 8, (f32)screenwidth/(f32)screenheight, 1.0f, 300.0F);
     GX_LoadProjectionMtx(projection, GX_PERSPECTIVE);
 
     GX_SetVtxDesc(GX_VA_POS, GX_INDEX8);
@@ -215,7 +215,8 @@ void BoxCover::Draw()
     guMtxRotAxisDeg(modelView, &cubeAxis, RotZ-Animation);
     guMtxConcat(modelView3, modelView2, modelView2);
     guMtxConcat(modelView2, modelView, modelView);
-    //guMtxScaleApply(modelView, modelView, BoxScale, BoxScale, BoxScale);
+    if(Settings.widescreen)
+        guMtxScaleApply(modelView, modelView, Settings.WSFactor, 1.0f, 1.0f);
     guMtxTransApply(modelView, modelView, PosX+xoffsetDyn/680.0f+movePosX, PosY+yoffsetDyn/680.0f+movePosY, PosZ);
     guMtxConcat(view,modelView,modelView);
 
@@ -317,14 +318,14 @@ void BoxCover::UpdateEffects()
 
     if(effects & EFFECT_BOX_FLY_CENTRE)
     {
-        if(PosX > 0.01f)
-            PosX -= effectAmount/1200.0f;
-        if(PosY > 0.01f)
-            PosY -= effectAmount/1200.0f;
-        if(PosX < -0.01f)
-            PosX += effectAmount/1200.0f;
-        if(PosY < -0.01f)
-            PosY += effectAmount/1200.0f;
+        if(PosX > 0.1f)
+            PosX -= effectAmount/1200.f;
+        if(PosY > 0.1f)
+            PosY -= effectAmount/1200.f;
+        if(PosX < -0.1f)
+            PosX += effectAmount/1200.f;
+        if(PosY < -0.1f)
+            PosY += effectAmount/1200.f;
 
         movePosX = 0.0f;
         movePosY = 0.0f;
@@ -342,13 +343,13 @@ void BoxCover::UpdateEffects()
     else if(effects & EFFECT_BOX_FLY_BACK)
     {
         if(PosX > PosXOrig+0.1f)
-            PosX -= effectAmount/1200.0f;
+            PosX -= effectAmount/1200.f;
         if(PosY > PosYOrig+0.1f)
-            PosY -= effectAmount/1200.0f;
+            PosY -= effectAmount/1200.f;
         if(PosX < PosXOrig-0.1f)
-            PosX += effectAmount/1200.0f;
+            PosX += effectAmount/1200.f;
         if(PosY < PosYOrig-0.1f)
-            PosY += effectAmount/1200.0f;
+            PosY += effectAmount/1200.f;
 
         PosZ -= 0.4f;
         RotY -= effectAmount/4.9f;
diff --git a/source/BoxCover/BoxCover.hpp b/source/BoxCover/BoxCover.hpp
index f16cf5b5..63c21382 100644
--- a/source/BoxCover/BoxCover.hpp
+++ b/source/BoxCover/BoxCover.hpp
@@ -69,7 +69,7 @@ class BoxCover : public GuiImage
         int moveChan;
         bool flatCover;
         bool Zoomable;
-        guVector camera, up, look;
+        Mtx44 projection;
         GuiImageData boxBorder;
         GuiImageData *defaultBox;
         GuiImageData *NormalPointers[4];
@@ -79,8 +79,6 @@ class BoxCover : public GuiImage
         GXTexObj boxBorderTex;
         GXTexObj defaultBoxTex;
         GXColor boxColor;
-
-
 };
 
 #endif
diff --git a/source/FileOperations/DirList.cpp b/source/FileOperations/DirList.cpp
index 8bc7d1ff..831d998a 100644
--- a/source/FileOperations/DirList.cpp
+++ b/source/FileOperations/DirList.cpp
@@ -81,7 +81,7 @@ bool DirList::LoadPath(std::string &folderpath, const char *filter, u32 flags)
     if(!filename || !st)
     {
         delete [] filename;
-        delete filename;
+        delete st;
         closedir(dir);
         return false;
     }
diff --git a/source/FreeTypeGX.cpp b/source/FreeTypeGX.cpp
index ff250197..093e639e 100644
--- a/source/FreeTypeGX.cpp
+++ b/source/FreeTypeGX.cpp
@@ -377,15 +377,12 @@ uint16_t FreeTypeGX::drawText(int16_t x, int16_t y, int16_t z, const wchar_t *te
         {
             if (ftKerningEnabled && i > 0)
             {
-                FT_Get_Kerning(ftFace, fontData[pixelSize][text[i - 1]].glyphIndex, glyphData->glyphIndex,
-                        FT_KERNING_DEFAULT, &pairDelta);
+                FT_Get_Kerning(ftFace, fontData[pixelSize][text[i - 1]].glyphIndex, glyphData->glyphIndex, FT_KERNING_DEFAULT, &pairDelta);
                 x_pos += pairDelta.x >> 6;
             }
 
-            GX_InitTexObj(&glyphTexture, glyphData->glyphDataTexture, glyphData->textureWidth,
-                    glyphData->textureHeight, GX_TF_IA4, GX_CLAMP, GX_CLAMP, GX_FALSE);
-            copyTextureToFramebuffer(&glyphTexture, glyphData->textureWidth, glyphData->textureHeight, x_pos
-                    + glyphData->renderOffsetX + x_offset, y - glyphData->renderOffsetY + y_offset, z, color);
+            GX_InitTexObj(&glyphTexture, glyphData->glyphDataTexture, glyphData->textureWidth, glyphData->textureHeight, GX_TF_IA4, GX_CLAMP, GX_CLAMP, GX_FALSE);
+            copyTextureToFramebuffer(&glyphTexture, glyphData->textureWidth, glyphData->textureHeight, x_pos + glyphData->renderOffsetX + x_offset, y - glyphData->renderOffsetY + y_offset, z, color);
 
             x_pos += glyphData->glyphAdvanceX;
             ++printed;
diff --git a/source/libwiigui/Text.cpp b/source/libwiigui/Text.cpp
index 31e1df09..153785fe 100644
--- a/source/libwiigui/Text.cpp
+++ b/source/libwiigui/Text.cpp
@@ -1,3 +1,4 @@
+#include "settings/CSettings.h"
 #include "Text.hpp"
 
 Text::Text(const char * t, int s, GXColor c) :
@@ -312,7 +313,7 @@ void Text::Draw()
     GXColor c = color;
     c.a = this->GetAlpha();
 
-    int newSize = size * GetScale();
+    int newSize = size * GetScale() * Settings.FontScaleFactor;
 
     if (newSize != currentSize)
     {
diff --git a/source/libwiigui/gui.h b/source/libwiigui/gui.h
index 1643f2e8..8856a6c6 100644
--- a/source/libwiigui/gui.h
+++ b/source/libwiigui/gui.h
@@ -216,10 +216,10 @@ class GuiElement
         int GetMaxX();
         //!Gets the current width of the element. Does not currently consider the scale
         //!\return width
-        int GetWidth();
+        virtual int GetWidth();
         //!Gets the height of the element. Does not currently consider the scale
         //!\return height
-        int GetHeight();
+        virtual int GetHeight();
         //!Sets the size (width/height) of the element
         //!\param w Width of element
         //!\param h Height of element
@@ -662,6 +662,8 @@ class GuiText: public GuiElement
         void SetFont(FreeTypeGX *f);
         //!Get the original text as char
         virtual const wchar_t * GetText();
+        //!Overload for GetWidth()
+        int GetWidth() { return GetTextWidth(); }
         //!Get the Horizontal Size of Text
         int GetTextWidth();
         int GetTextWidth(int ind);
diff --git a/source/libwiigui/gui_diskcover.cpp b/source/libwiigui/gui_diskcover.cpp
index c68cb51a..bbeb19bd 100644
--- a/source/libwiigui/gui_diskcover.cpp
+++ b/source/libwiigui/gui_diskcover.cpp
@@ -1,4 +1,5 @@
 #include "gui_diskcover.h"
+#include "settings/CSettings.h"
 
 GuiDiskCover::GuiDiskCover()
 {
@@ -75,11 +76,11 @@ void GuiDiskCover::Draw()
     LOCK( this );
     if (!image || !this->IsVisible()) return;
     float currScale = this->GetScale();
-    //  Menu_DrawDiskCoverShadow(this->GetLeft(), this->GetTop(), 190, width, height, 40, image, imageangle, deg_beta, widescreen ? currScale*0.8 : currScale, currScale, this->GetAlpha(), true);
+	
     Menu_DrawDiskCover(this->GetLeft(), this->GetTop(), PosZ, width, height, Distance, image, imageangle, deg_beta,
-            widescreen ? currScale * 0.8 : currScale, currScale, 64, true);
+            widescreen ? currScale * Settings.WSFactor : currScale, currScale, 64, true);
     Menu_DrawDiskCover(this->GetLeft(), this->GetTop(), PosZ, width, height, Distance, image, imageangle, deg_beta,
-            widescreen ? currScale * 0.8 : currScale, currScale, this->GetAlpha(), false);
+            widescreen ? currScale * Settings.WSFactor : currScale, currScale, this->GetAlpha(), false);
 
     if (eff_step)
     {
diff --git a/source/libwiigui/gui_gamebrowser.cpp b/source/libwiigui/gui_gamebrowser.cpp
index ec3ee586..a2580a56 100644
--- a/source/libwiigui/gui_gamebrowser.cpp
+++ b/source/libwiigui/gui_gamebrowser.cpp
@@ -248,21 +248,6 @@ int GuiGameBrowser::GetClickedOption()
     return found;
 }
 
-int GuiGameBrowser::GetSelectedOption()
-{
-    int found = -1;
-    for (int i = 0; i < pagesize; i++)
-    {
-        if (game[i]->GetState() == STATE_SELECTED)
-        {
-            game[i]->SetState(STATE_SELECTED);
-            found = gameIndex[i];
-            break;
-        }
-    }
-    return found;
-}
-
 /****************************************************************************
  * FindMenuItem
  *
diff --git a/source/libwiigui/gui_gamebrowser.h b/source/libwiigui/gui_gamebrowser.h
index f685033a..772b1999 100644
--- a/source/libwiigui/gui_gamebrowser.h
+++ b/source/libwiigui/gui_gamebrowser.h
@@ -11,7 +11,7 @@ class GuiGameBrowser: public GuiElement
         ~GuiGameBrowser();
         int FindMenuItem(int c, int d);
         int GetClickedOption();
-        int GetSelectedOption();
+        int GetSelectedOption() { return listOffset+selectedItem; }
         void ResetState();
         void SetFocus(int f);
         void Draw();
diff --git a/source/libwiigui/gui_image.cpp b/source/libwiigui/gui_image.cpp
index 964d6b7d..aadd3299 100644
--- a/source/libwiigui/gui_image.cpp
+++ b/source/libwiigui/gui_image.cpp
@@ -9,6 +9,7 @@
  ***************************************************************************/
 
 #include "gui.h"
+#include "settings/CSettings.h"
 /**
  * Constructor for the GuiImage class.
  */
@@ -440,7 +441,7 @@ void GuiImage::Draw()
     {
         for (int i = 0; i < tile; i++)
             Menu_DrawImg(currLeft + width * i, this->GetTop(), zoffset, width, height, image, imageangle,
-                    widescreen ? currScale * 0.80 : currScale, currScale, this->GetAlpha(), xx1, yy1, xx2, yy2, xx3,
+                    widescreen ? currScale * Settings.WSFactor : currScale, currScale, this->GetAlpha(), xx1, yy1, xx2, yy2, xx3,
                     yy3, xx4, yy4);
     }
     else
@@ -448,7 +449,7 @@ void GuiImage::Draw()
         // temporary (maybe), used to correct offset for scaled images
         if (scale != 1) currLeft = currLeft - width / 2 + (width * scale) / 2;
 
-        Menu_DrawImg(currLeft, this->GetTop(), zoffset, width, height, image, imageangle, widescreen ? currScale * 0.80
+        Menu_DrawImg(currLeft, this->GetTop(), zoffset, width, height, image, imageangle, widescreen ? currScale * Settings.WSFactor
                 : currScale, currScale, this->GetAlpha(), xx1, yy1, xx2, yy2, xx3, yy3, xx4, yy4);
     }
 
diff --git a/source/libwiigui/gui_text.cpp b/source/libwiigui/gui_text.cpp
index bd3bbcdf..2148e23f 100644
--- a/source/libwiigui/gui_text.cpp
+++ b/source/libwiigui/gui_text.cpp
@@ -10,6 +10,7 @@
 
 #include "gui.h"
 #include "wstring.hpp"
+#include "settings/CSettings.h"
 
 #define MAX_LINES_TO_DRAW   9
 
@@ -18,8 +19,7 @@ static int presetMaxWidth = 0;
 static int presetAlignmentHor = 0;
 static int presetAlignmentVert = 0;
 static u16 presetStyle = 0;
-static GXColor presetColor = ( GXColor )
-{   255, 255, 255, 255};
+static GXColor presetColor = (GXColor) {255, 255, 255, 255};
 
 #define TEXT_SCROLL_DELAY           5
 #define TEXT_SCROLL_INITIAL_DELAY   8
@@ -527,7 +527,7 @@ void GuiText::Draw()
     GXColor c = color;
     c.a = GetAlpha();
 
-    int newSize = size * GetScale();
+    int newSize = size * GetScale() * Settings.FontScaleFactor;
 
     if (newSize != currentSize)
     {
@@ -540,18 +540,19 @@ void GuiText::Draw()
     {
         if (wrapMode == DOTTED) // text dotted
         {
-            if (textDyn.size() == 0) MakeDottedText();
+            if (textDyn.size() == 0)
+                MakeDottedText();
 
-            if (textDyn.size() > 0) (font ? font : fontSystem)->drawText(this->GetLeft(), this->GetTop(), 0,
-                    textDyn[textDyn.size() - 1], currentSize, c, style);
+            if (textDyn.size() > 0)
+                (font ? font : fontSystem)->drawText(this->GetLeft(), this->GetTop(), 0, textDyn[textDyn.size() - 1], currentSize, c, style);
         }
 
         else if (wrapMode == SCROLL_HORIZONTAL)
         {
             ScrollText();
 
-            if (textDyn.size() > 0) (font ? font : fontSystem)->drawText(this->GetLeft(), this->GetTop(), 0,
-                    textDyn[textDyn.size() - 1], currentSize, c, style);
+            if (textDyn.size() > 0)
+                (font ? font : fontSystem)->drawText(this->GetLeft(), this->GetTop(), 0, textDyn[textDyn.size() - 1], currentSize, c, style);
         }
         else if (wrapMode == WRAP)
         {
@@ -563,8 +564,7 @@ void GuiText::Draw()
 
             for (u32 i = 0; i < textDyn.size(); i++)
             {
-                (font ? font : fontSystem)->drawText(this->GetLeft(), this->GetTop() + voffset + i * lineheight, 0,
-                        textDyn[i], currentSize, c, style);
+                (font ? font : fontSystem)->drawText(this->GetLeft(), this->GetTop() + voffset + i * lineheight, 0, textDyn[i], currentSize, c, style);
             }
         }
     }
diff --git a/source/menu.cpp b/source/menu.cpp
index 4c64d180..b73d01f9 100644
--- a/source/menu.cpp
+++ b/source/menu.cpp
@@ -116,7 +116,7 @@ static void * UpdateGUI(void *arg)
                              userInput[i].wpad.ir.y - pointer[i]->GetHeight()/2,
                              9900.0f, pointer[i]->GetWidth(), pointer[i]->GetHeight(),
                              pointer[i]->GetImage(), userInput[i].wpad.ir.angle,
-                             Settings.widescreen ? 0.8f : 1.f, 1.f, 255, 0, 0, 0, 0, 0, 0, 0, 0);
+                             Settings.widescreen ? Settings.WSFactor : 1.f, 1.f, 255, 0, 0, 0, 0, 0, 0, 0, 0);
             }
         }
 
diff --git a/source/prompts/ProgressWindow.cpp b/source/prompts/ProgressWindow.cpp
index 2483c30e..10d2f9df 100644
--- a/source/prompts/ProgressWindow.cpp
+++ b/source/prompts/ProgressWindow.cpp
@@ -181,9 +181,9 @@ static void UpdateProgressValues(GuiImage *progressbarImg, GuiText *prTxt, GuiTe
     prTxt->SetTextf("%.2f", progressPercent);
 
     if (Settings.widescreen && Settings.wsprompt)
-        progressbarImg->SetSkew(0, 0, static_cast<int> (progressbarImg->GetWidth() * progressPercent * 0.8)
+        progressbarImg->SetSkew(0, 0, static_cast<int> (progressbarImg->GetWidth() * progressPercent * Settings.WSFactor)
                 - progressbarImg->GetWidth(), 0, static_cast<int> (progressbarImg->GetWidth() * progressPercent
-                * 0.8) - progressbarImg->GetWidth(), 0, 0, 0);
+                * Settings.WSFactor) - progressbarImg->GetWidth(), 0, 0, 0);
     else
         progressbarImg->SetSkew(0, 0, static_cast<int> (progressbarImg->GetWidth() * progressPercent)
             - progressbarImg->GetWidth(), 0, static_cast<int> (progressbarImg->GetWidth() * progressPercent)
diff --git a/source/prompts/PromptWindows.cpp b/source/prompts/PromptWindows.cpp
index bcc83835..b64cee44 100644
--- a/source/prompts/PromptWindows.cpp
+++ b/source/prompts/PromptWindows.cpp
@@ -240,11 +240,10 @@ void WindowCredits()
     txt[i]->SetPosition(0, 12);
     i++;
 
+    char SvnRev[30];
 #ifdef FULLCHANNEL
-    char SvnRev[30];
-    snprintf( SvnRev, sizeof( SvnRev ), "Rev%sc   IOS%u (Rev %u)", GetRev(), IOS_GetVersion(), IOS_GetRevision() );
+    snprintf(SvnRev, sizeof(SvnRev), "Rev%sc   IOS%u (Rev %u)", GetRev(), IOS_GetVersion(), IOS_GetRevision());
 #else
-    char SvnRev[30];
     snprintf(SvnRev, sizeof(SvnRev), "Rev%s   IOS%u (Rev %u)", GetRev(), IOS_GetVersion(), IOS_GetRevision());
 #endif
 
@@ -362,35 +361,35 @@ void WindowCredits()
     sprintf(text, "Waninkoko, Kwiirk & Hermes %s", tr( "for the USB Loader source" ));
     txt[i] = new GuiText(text);
     txt[i]->SetAlignment(ALIGN_LEFT, ALIGN_TOP);
-    txt[i]->SetPosition(60, y);
+    txt[i]->SetPosition(10, y);
     i++;
     y += 20;
 
     sprintf(text, "Tantric %s", tr( "for his awesome tool LibWiiGui" ));
     txt[i] = new GuiText(text);
     txt[i]->SetAlignment(ALIGN_LEFT, ALIGN_TOP);
-    txt[i]->SetPosition(60, y);
+    txt[i]->SetPosition(10, y);
     i++;
     y += 20;
 
     sprintf(text, "Fishears/Nuke %s", tr( "for Ocarina" ));
     txt[i] = new GuiText(text);
     txt[i]->SetAlignment(ALIGN_LEFT, ALIGN_TOP);
-    txt[i]->SetPosition(60, y);
+    txt[i]->SetPosition(10, y);
     i++;
     y += 20;
 
     sprintf(text, "WiiPower %s", tr( "for diverse patches" ));
     txt[i] = new GuiText(text);
     txt[i]->SetAlignment(ALIGN_LEFT, ALIGN_TOP);
-    txt[i]->SetPosition(60, y);
+    txt[i]->SetPosition(10, y);
     i++;
     y += 20;
 
     sprintf(text, "Oggzee %s", tr( "for FAT/NTFS support" ));
     txt[i] = new GuiText(text);
     txt[i]->SetAlignment(ALIGN_LEFT, ALIGN_TOP);
-    txt[i]->SetPosition(60, y);
+    txt[i]->SetPosition(10, y);
     i++;
     y += 20;
 
diff --git a/source/prompts/gameinfo.cpp b/source/prompts/gameinfo.cpp
index 652dfee4..735104f9 100644
--- a/source/prompts/gameinfo.cpp
+++ b/source/prompts/gameinfo.cpp
@@ -396,7 +396,7 @@ static int InternalShowGameInfo(char *ID)
         playersImg->SetPosition(intputX, inputY);
         playersImg->SetAlignment(0, 4);
         InfoWindow.Append(playersImg);
-        intputX += (Settings.widescreen ? playersImg->GetWidth() * .8 : playersImg->GetWidth()) + 5;
+        intputX += (Settings.widescreen ? playersImg->GetWidth() * Settings.WSFactor : playersImg->GetWidth()) + 5;
     }
 
     //draw the input types for this game
@@ -407,7 +407,7 @@ static int InternalShowGameInfo(char *ID)
         motionplusImg->SetPosition(intputX, inputY);
         motionplusImg->SetAlignment(0, 4);
         InfoWindow.Append(motionplusImg);
-        intputX += (Settings.widescreen ? motionplusImg->GetWidth() * .8 : motionplusImg->GetWidth()) + 5;
+        intputX += (Settings.widescreen ? motionplusImg->GetWidth() * Settings.WSFactor : motionplusImg->GetWidth()) + 5;
     }
     if (nunchuk == 1)
     {
@@ -416,7 +416,7 @@ static int InternalShowGameInfo(char *ID)
         nunchukImg->SetPosition(intputX, inputY);
         nunchukImg->SetAlignment(0, 4);
         InfoWindow.Append(nunchukImg);
-        intputX += (Settings.widescreen ? nunchukImg->GetWidth() * .8 : nunchukImg->GetWidth()) + 5;
+        intputX += (Settings.widescreen ? nunchukImg->GetWidth() * Settings.WSFactor : nunchukImg->GetWidth()) + 5;
     }
     if (classiccontroller == 1)
     {
@@ -425,7 +425,7 @@ static int InternalShowGameInfo(char *ID)
         classiccontrollerImg->SetPosition(intputX, inputY);
         classiccontrollerImg->SetAlignment(0, 4);
         InfoWindow.Append(classiccontrollerImg);
-        intputX += (Settings.widescreen ? classiccontrollerImg->GetWidth() * .8 : classiccontrollerImg->GetWidth()) + 5;
+        intputX += (Settings.widescreen ? classiccontrollerImg->GetWidth() * Settings.WSFactor : classiccontrollerImg->GetWidth()) + 5;
     }
     if (gamecube == 1)
     {
@@ -434,7 +434,7 @@ static int InternalShowGameInfo(char *ID)
         gcImg->SetPosition(intputX, inputY);
         gcImg->SetAlignment(0, 4);
         InfoWindow.Append(gcImg);
-        intputX += (Settings.widescreen ? gcImg->GetWidth() * .8 : gcImg->GetWidth()) + 5;
+        intputX += (Settings.widescreen ? gcImg->GetWidth() * Settings.WSFactor : gcImg->GetWidth()) + 5;
     }
     if (wheel == 1)
     {
@@ -443,7 +443,7 @@ static int InternalShowGameInfo(char *ID)
         wheelImg->SetPosition(intputX, inputY);
         wheelImg->SetAlignment(0, 4);
         InfoWindow.Append(wheelImg);
-        intputX += (Settings.widescreen ? wheelImg->GetWidth() * .8 : wheelImg->GetWidth()) + 5;
+        intputX += (Settings.widescreen ? wheelImg->GetWidth() * Settings.WSFactor : wheelImg->GetWidth()) + 5;
     }
     if (guitar == 1)
     {
@@ -452,7 +452,7 @@ static int InternalShowGameInfo(char *ID)
         guitarImg->SetPosition(intputX, inputY);
         guitarImg->SetAlignment(0, 4);
         InfoWindow.Append(guitarImg);
-        intputX += (Settings.widescreen ? guitarImg->GetWidth() * .8 : guitarImg->GetWidth()) + 5;
+        intputX += (Settings.widescreen ? guitarImg->GetWidth() * Settings.WSFactor : guitarImg->GetWidth()) + 5;
     }
     if (drums == 1)
     {
@@ -461,7 +461,7 @@ static int InternalShowGameInfo(char *ID)
         drumsImg->SetPosition(intputX, inputY);
         drumsImg->SetAlignment(0, 4);
         InfoWindow.Append(drumsImg);
-        intputX += (Settings.widescreen ? drumsImg->GetWidth() * .8 : drumsImg->GetWidth()) + 5;
+        intputX += (Settings.widescreen ? drumsImg->GetWidth() * Settings.WSFactor : drumsImg->GetWidth()) + 5;
     }
     if (microphone == 1)
     {
@@ -470,7 +470,7 @@ static int InternalShowGameInfo(char *ID)
         microphoneImg->SetPosition(intputX, inputY);
         microphoneImg->SetAlignment(0, 4);
         InfoWindow.Append(microphoneImg);
-        intputX += (Settings.widescreen ? microphoneImg->GetWidth() * .8 : microphoneImg->GetWidth()) + 5;
+        intputX += (Settings.widescreen ? microphoneImg->GetWidth() * Settings.WSFactor : microphoneImg->GetWidth()) + 5;
     }
     if (zapper == 1)
     {
@@ -479,7 +479,7 @@ static int InternalShowGameInfo(char *ID)
         zapperImg->SetPosition(intputX, inputY);
         zapperImg->SetAlignment(0, 4);
         InfoWindow.Append(zapperImg);
-        intputX += (Settings.widescreen ? zapperImg->GetWidth() * .8 : zapperImg->GetWidth()) + 5;
+        intputX += (Settings.widescreen ? zapperImg->GetWidth() * Settings.WSFactor : zapperImg->GetWidth()) + 5;
     }
     if (wiispeak == 1)
     {
@@ -488,7 +488,7 @@ static int InternalShowGameInfo(char *ID)
         wiispeakImg->SetPosition(intputX, inputY);
         wiispeakImg->SetAlignment(0, 4);
         InfoWindow.Append(wiispeakImg);
-        intputX += (Settings.widescreen ? wiispeakImg->GetWidth() * .8 : wiispeakImg->GetWidth()) + 5;
+        intputX += (Settings.widescreen ? wiispeakImg->GetWidth() * Settings.WSFactor : wiispeakImg->GetWidth()) + 5;
     }
     if (nintendods == 1)
     {
@@ -497,7 +497,7 @@ static int InternalShowGameInfo(char *ID)
         nintendodsImg->SetPosition(intputX, inputY);
         nintendodsImg->SetAlignment(0, 4);
         InfoWindow.Append(nintendodsImg);
-        intputX += (Settings.widescreen ? nintendodsImg->GetWidth() * .8 : nintendodsImg->GetWidth()) + 5;
+        intputX += (Settings.widescreen ? nintendodsImg->GetWidth() * Settings.WSFactor : nintendodsImg->GetWidth()) + 5;
     }
     if (dancepad == 1)
     {
@@ -506,7 +506,7 @@ static int InternalShowGameInfo(char *ID)
         dancepadImg->SetPosition(intputX, inputY);
         dancepadImg->SetAlignment(0, 4);
         InfoWindow.Append(dancepadImg);
-        intputX += (Settings.widescreen ? dancepadImg->GetWidth() * .8 : dancepadImg->GetWidth()) + 5;
+        intputX += (Settings.widescreen ? dancepadImg->GetWidth() * Settings.WSFactor : dancepadImg->GetWidth()) + 5;
     }
     if (balanceboard == 1)
     {
@@ -515,7 +515,7 @@ static int InternalShowGameInfo(char *ID)
         balanceboardImg->SetPosition(intputX, inputY);
         balanceboardImg->SetAlignment(0, 4);
         InfoWindow.Append(balanceboardImg);
-        intputX += (Settings.widescreen ? balanceboardImg->GetWidth() * .8 : balanceboardImg->GetWidth()) + 5;
+        intputX += (Settings.widescreen ? balanceboardImg->GetWidth() * Settings.WSFactor : balanceboardImg->GetWidth()) + 5;
     }
 
     // # online players
@@ -547,7 +547,7 @@ static int InternalShowGameInfo(char *ID)
         wifiplayersImg->SetPosition(intputX, inputY);
         wifiplayersImg->SetAlignment(0, 4);
         InfoWindow.Append(wifiplayersImg);
-        intputX += (Settings.widescreen ? wifiplayersImg->GetWidth() * .8 : wifiplayersImg->GetWidth()) + 5;
+        intputX += (Settings.widescreen ? wifiplayersImg->GetWidth() * Settings.WSFactor : wifiplayersImg->GetWidth()) + 5;
     }
 
     // ratings
@@ -614,7 +614,7 @@ static int InternalShowGameInfo(char *ID)
         ratingImg->SetPosition(-25, inputY);
         ratingImg->SetAlignment(1, 4);
         InfoWindow.Append(ratingImg);
-        intputX += (Settings.widescreen ? ratingImg->GetWidth() * .8 : ratingImg->GetWidth()) + 5;
+        intputX += (Settings.widescreen ? ratingImg->GetWidth() * Settings.WSFactor : ratingImg->GetWidth()) + 5;
     }
 
     // title
@@ -680,7 +680,7 @@ static int InternalShowGameInfo(char *ID)
         char linebuf[300];
         snprintf(linebuf, sizeof(linebuf), "%s : %s%i", tr( "Released" ), linebuf2, year);
         releasedTxt = new GuiText(linebuf, 16, ( GXColor ) {0, 0, 0, 255});
-        if (releasedTxt->GetWidth() > 300) newline = 2;
+        if (releasedTxt->GetTextWidth() > 300) newline = 2;
         releasedTxt->SetAlignment(ALIGN_RIGHT, ALIGN_TOP);
         releasedTxt->SetPosition(-17, 12 + indexy);
         indexy += (20 * newline);
@@ -693,7 +693,7 @@ static int InternalShowGameInfo(char *ID)
     {
         snprintf(linebuf2, sizeof(linebuf2), "%s %s", tr( "Published by" ), GameInfo.Publisher.c_str());
         publisherTxt = new GuiText(linebuf2, 16, ( GXColor ) {0, 0, 0, 255});
-        if (publisherTxt->GetWidth() > 250) newline = 2;
+        if (publisherTxt->GetTextWidth() > 250) newline = 2;
         publisherTxt->SetMaxWidth(250, WRAP);
         publisherTxt->SetAlignment(ALIGN_RIGHT, ALIGN_TOP);
         publisherTxt->SetPosition(-17, 12 + indexy);
@@ -707,7 +707,7 @@ static int InternalShowGameInfo(char *ID)
     {
         snprintf(linebuf2, sizeof(linebuf2), "%s %s", tr( "Developed by" ), GameInfo.Developer.c_str());
         developerTxt = new GuiText(linebuf2, 16, ( GXColor ) {0, 0, 0, 255});
-        if (developerTxt->GetWidth() > 250) newline = 2;
+        if (developerTxt->GetTextWidth() > 250) newline = 2;
         developerTxt->SetMaxWidth(250, WRAP);
         developerTxt->SetAlignment(ALIGN_RIGHT, ALIGN_TOP);
         developerTxt->SetPosition(-17, 12 + indexy);
diff --git a/source/settings/CSettings.cpp b/source/settings/CSettings.cpp
index be017878..f4467f36 100644
--- a/source/settings/CSettings.cpp
+++ b/source/settings/CSettings.cpp
@@ -116,6 +116,8 @@ void CSettings::SetDefault()
     MultiplePartitions = OFF;
     USBPort = 0;
     CacheTitles = ON;
+    WSFactor = 0.8f; //actually should be 0.75 for real widescreen
+    FontScaleFactor = 1.0f;
 }
 
 bool CSettings::Load()
@@ -259,6 +261,8 @@ bool CSettings::Save()
     fprintf(file, "MultiplePartitions = %d\n ", MultiplePartitions);
     fprintf(file, "USBPort = %d\n ", USBPort);
     fprintf(file, "CacheTitles = %d\n ", CacheTitles);
+    fprintf(file, "WSFactor = %0.3f\n ", WSFactor);
+    fprintf(file, "FontScaleFactor = %0.3f\n ", FontScaleFactor);
     fclose(file);
 
     return true;
@@ -516,6 +520,16 @@ bool CSettings::SetSetting(char *name, char *value)
         InstallPartitions = strtoul(value, 0, 16);
         return true;
     }
+    else if (strcmp(name, "WSFactor") == 0)
+    {
+        WSFactor = atof(value);
+        return true;
+    }
+    else if (strcmp(name, "FontScaleFactor") == 0)
+    {
+        FontScaleFactor = atof(value);
+        return true;
+    }
     else if (strcmp(name, "ParentalBlocks") == 0)
     {
         ParentalBlocks = strtoul(value, 0, 16);
diff --git a/source/settings/CSettings.h b/source/settings/CSettings.h
index 38645174..1cd3c982 100644
--- a/source/settings/CSettings.h
+++ b/source/settings/CSettings.h
@@ -115,6 +115,8 @@ class CSettings
         short CacheTitles;
         u32 InstallPartitions;
         u32 ParentalBlocks;
+        f32 WSFactor;
+        f32 FontScaleFactor;
     protected:
         bool ValidVersion(FILE * file);
         bool SetSetting(char *name, char *value);
diff --git a/source/settings/menus/GUISettingsMenu.cpp b/source/settings/menus/GUISettingsMenu.cpp
index 73b9fd60..6d7b112e 100644
--- a/source/settings/menus/GUISettingsMenu.cpp
+++ b/source/settings/menus/GUISettingsMenu.cpp
@@ -111,6 +111,8 @@ GuiSettingsMenu::GuiSettingsMenu()
     Options->SetName(Idx++, "%s", tr( "Tooltips" ));
     Options->SetName(Idx++, "%s", tr( "Flip-X" ));
     Options->SetName(Idx++, "%s", tr( "Prompts Buttons" ));
+    Options->SetName(Idx++, "%s", tr( "Widescreen Factor" ));
+    Options->SetName(Idx++, "%s", tr( "Font Scale Factor" ));
     Options->SetName(Idx++, "%s", tr( "Keyboard" ));
     Options->SetName(Idx++, "%s", tr( "Disc Artwork Download" ));
     Options->SetName(Idx++, "%s", tr( "Wiilight" ));
@@ -168,6 +170,12 @@ void GuiSettingsMenu::SetOptionValues()
     //! Settings: Prompts Buttons
     Options->SetValue(Idx++, "%s", tr( PromptButtonsText[Settings.wsprompt] ));
 
+    //! Settings: Widescreen Factor
+    Options->SetValue(Idx++, "%0.3f", Settings.WSFactor);
+
+    //! Settings: Font Scale Factor
+    Options->SetValue(Idx++, "%0.3f", Settings.FontScaleFactor);
+
     //! Settings: Keyboard
     Options->SetValue(Idx++, "%s", KeyboardText[Settings.keyset]);
 
@@ -281,6 +289,26 @@ int GuiSettingsMenu::GetMenuInternal()
         if (++Settings.wsprompt >= MAX_ON_OFF) Settings.wsprompt = 0;
     }
 
+    //! Settings: Widescreen Factor
+    else if (ret == ++Idx)
+    {
+        char entrie[20];
+        snprintf(entrie, sizeof(entrie), "%0.3f", Settings.WSFactor);
+        int ret = OnScreenKeyboard(entrie, sizeof(entrie), 0);
+        if(ret)
+            Settings.WSFactor = atof(entrie);
+    }
+
+    //! Settings: Font Scale Factor
+    else if (ret == ++Idx)
+    {
+        char entrie[20];
+        snprintf(entrie, sizeof(entrie), "%0.3f", Settings.FontScaleFactor);
+        int ret = OnScreenKeyboard(entrie, sizeof(entrie), 0);
+        if(ret)
+            Settings.FontScaleFactor = atof(entrie);
+    }
+
     //! Settings: Keyboard
     else if (ret == ++Idx)
     {
diff --git a/source/usbloader/wbfs/wbfs_fat.cpp b/source/usbloader/wbfs/wbfs_fat.cpp
index 76259417..8f0a8f9e 100644
--- a/source/usbloader/wbfs/wbfs_fat.cpp
+++ b/source/usbloader/wbfs/wbfs_fat.cpp
@@ -423,12 +423,16 @@ s32 Wbfs_Fat::GetHeadersCount()
                 // usb:/wbfs/TITLE[GAMEID]/GAMEID.wbfs
                 lay_b = 1;
             }
-            else if (fname[6] == '_' && is_gameid((char*) id))
+            else if (fname[6] == '_')
             {
                 // usb:/wbfs/GAMEID_TITLE/GAMEID.wbfs
-                lay_a = 1;
                 memcpy(id, fname, 6);
-                snprintf(fname_title, sizeof(fname_title), &fname[7]);
+
+                if(is_gameid((char*) id))
+                {
+                    lay_a = 1;
+                    snprintf(fname_title, sizeof(fname_title), &fname[7]);
+                }
             }
 
             if (!lay_a && !lay_b) continue;