diff --git a/HBC/META.XML b/HBC/META.XML
index 01e29aa6..b77b00eb 100644
--- a/HBC/META.XML
+++ b/HBC/META.XML
@@ -2,14 +2,14 @@
 	<app version="1">
 		<name> USB Loader GX</name>
 		<coder>USB Loader GX Team</coder>
-		<version>2.2 r1099</version>
-		<release_date>201106272106</release_date>
+		<version>2.2 r1101</version>
+		<release_date>201106301853</release_date>
         <!--   // remove this line to enable arguments
         <arguments>
                 <arg>--ios=250</arg>
                 <arg>--usbport=0</arg>
         </arguments>
-        -->  // remove this line to enable arguments
+        // remove this line to enable arguments -->
 		<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/data/app_booter.bin b/data/app_booter.bin
new file mode 100644
index 00000000..08d18063
Binary files /dev/null and b/data/app_booter.bin differ
diff --git a/data/app_booter.dol b/data/app_booter.dol
deleted file mode 100644
index 62c156fe..00000000
Binary files a/data/app_booter.dol and /dev/null differ
diff --git a/data/fonts/font.ttf b/data/fonts/font.ttf
deleted file mode 100644
index 01ce5816..00000000
Binary files a/data/fonts/font.ttf and /dev/null differ
diff --git a/gui.pnproj b/gui.pnproj
index e730919f..7751b92e 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="GUI" path="GUI\"><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_checkboxbrowser.cpp"></File><File path="gui_checkboxbrowser.hpp"></File><File path="gui_checksign.cpp"></File><File path="gui_checksign.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_diskcover.cpp"></File><File path="gui_diskcover.h"></File><File path="gui_element.cpp"></File><File path="gui_filebrowser.cpp"></File><File path="gui_filebrowser.h"></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_gamelist.cpp"></File><File path="gui_gamelist.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_optionbrowser.h"></File><File path="gui_scrollbar.cpp"></File><File path="gui_scrollbar.hpp"></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="sigslot.h"></File><File path="Text.cpp"></File><File path="Text.hpp"></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="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="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="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><File path="Wiinnertag.cpp"></File><File path="Wiinnertag.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="CategoryPrompt.cpp"></File><File path="CategoryPrompt.hpp"></File><File path="CategorySelectPrompt.cpp"></File><File path="CategorySelectPrompt.hpp"></File><File path="CategorySwitchPrompt.cpp"></File><File path="CategorySwitchPrompt.hpp"></File><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="HomebrewPrompt.cpp"></File><File path="HomebrewPrompt.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="FeatureSettingsMenu.cpp"></File><File path="FeatureSettingsMenu.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="HardDriveSM.cpp"></File><File path="HardDriveSM.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="CCategoryList.cpp"></File><File path="CCategoryList.hpp"></File><File path="CGameCategories.cpp"></File><File path="CGameCategories.hpp"></File><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="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="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="filelist.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="tinyxml.cpp"></File><File path="tinyxml.h"></File><File path="tinyxmlerror.cpp"></File><File path="tinyxmlparser.cpp"></File><File path="WiiTDB.cpp"></File><File path="WiiTDB.hpp"></File></MagicFolder><File path="audio.cpp"></File><File path="audio.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="GUI" path="GUI\"><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_checkboxbrowser.cpp"></File><File path="gui_checkboxbrowser.hpp"></File><File path="gui_checksign.cpp"></File><File path="gui_checksign.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_diskcover.cpp"></File><File path="gui_diskcover.h"></File><File path="gui_element.cpp"></File><File path="gui_filebrowser.cpp"></File><File path="gui_filebrowser.h"></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_gamelist.cpp"></File><File path="gui_gamelist.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_optionbrowser.h"></File><File path="gui_scrollbar.cpp"></File><File path="gui_scrollbar.hpp"></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="sigslot.h"></File><File path="Text.cpp"></File><File path="Text.hpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="homebrewboot" path="homebrewboot\"><File path="BootHomebrew.cpp"></File><File path="BootHomebrew.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="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="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><File path="Wiinnertag.cpp"></File><File path="Wiinnertag.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="CategoryPrompt.cpp"></File><File path="CategoryPrompt.hpp"></File><File path="CategorySelectPrompt.cpp"></File><File path="CategorySelectPrompt.hpp"></File><File path="CategorySwitchPrompt.cpp"></File><File path="CategorySwitchPrompt.hpp"></File><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="HomebrewPrompt.cpp"></File><File path="HomebrewPrompt.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="FeatureSettingsMenu.cpp"></File><File path="FeatureSettingsMenu.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="HardDriveSM.cpp"></File><File path="HardDriveSM.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="CCategoryList.cpp"></File><File path="CCategoryList.hpp"></File><File path="CGameCategories.cpp"></File><File path="CGameCategories.hpp"></File><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="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="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="filelist.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="tinyxml.cpp"></File><File path="tinyxml.h"></File><File path="tinyxmlerror.cpp"></File><File path="tinyxmlparser.cpp"></File><File path="WiiTDB.cpp"></File><File path="WiiTDB.hpp"></File></MagicFolder><File path="audio.cpp"></File><File path="audio.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/FreeTypeGX.cpp b/source/FreeTypeGX.cpp
index 093e639e..c6c703ce 100644
--- a/source/FreeTypeGX.cpp
+++ b/source/FreeTypeGX.cpp
@@ -63,15 +63,23 @@ wchar_t* charToWideChar(const char* strChar)
 /**
  * Default constructor for the FreeTypeGX class for WiiXplorer.
  */
-FreeTypeGX::FreeTypeGX(const uint8_t* fontBuffer, FT_Long bufferSize)
+FreeTypeGX::FreeTypeGX(const uint8_t* fontBuffer, FT_Long bufferSize, bool lastFace)
 {
+	int faceIndex = 0;
     ftPointSize = 0;
 
     FT_Init_FreeType(&ftLibrary);
-    FT_New_Memory_Face(ftLibrary, (FT_Byte *) fontBuffer, bufferSize, 0, &ftFace);
+    if(lastFace)
+    {
+		FT_New_Memory_Face(ftLibrary, (FT_Byte *)fontBuffer, bufferSize, -1, &ftFace);
+		faceIndex = ftFace->num_faces - 1; // Use the last face
+		FT_Done_Face(ftFace);
+		ftFace = NULL;
+    }
+    FT_New_Memory_Face(ftLibrary, (FT_Byte *) fontBuffer, bufferSize, faceIndex, &ftFace);
 
     setVertexFormat(GX_VTXFMT1);
-    ftKerningEnabled = false;
+    ftKerningEnabled = false;//FT_HAS_KERNING(ftFace);
 }
 
 /**
diff --git a/source/FreeTypeGX.h b/source/FreeTypeGX.h
index 7b50215d..50a70411 100644
--- a/source/FreeTypeGX.h
+++ b/source/FreeTypeGX.h
@@ -132,7 +132,7 @@ class FreeTypeGX
                 int16_t screenZ, GXColor color);
 
     public:
-        FreeTypeGX(const uint8_t* fontBuffer, FT_Long bufferSize);
+        FreeTypeGX(const uint8_t* fontBuffer, FT_Long bufferSize, bool lastFace = false);
         ~FreeTypeGX();
 
         void setVertexFormat(uint8_t vertexIndex);
diff --git a/source/GUI/Text.cpp b/source/GUI/Text.cpp
index 2462c0ee..ff1449c4 100644
--- a/source/GUI/Text.cpp
+++ b/source/GUI/Text.cpp
@@ -312,7 +312,7 @@ void Text::Draw()
     GXColor c = color;
     c.a = this->GetAlpha();
 
-    int newSize = (int) (size * GetScale() * Settings.FontScaleFactor);
+    int newSize = (int) (size * GetScale());
 
     if (newSize != currentSize)
     {
diff --git a/source/GUI/gui_text.cpp b/source/GUI/gui_text.cpp
index d0f4d3d0..153841ef 100644
--- a/source/GUI/gui_text.cpp
+++ b/source/GUI/gui_text.cpp
@@ -32,7 +32,7 @@ static GXColor presetColor = (GXColor) {255, 255, 255, 255};
 GuiText::GuiText(const char * t, int s, GXColor c)
 {
     text = NULL;
-    size = s;
+    size = (int) (s * Settings.FontScaleFactor);
     currentSize = size;
     color = c;
     alpha = c.a;
@@ -61,7 +61,7 @@ GuiText::GuiText(const char * t, int s, GXColor c)
 GuiText::GuiText(const wchar_t * t, int s, GXColor c)
 {
     text = NULL;
-    size = s;
+    size = (int) (s * Settings.FontScaleFactor);
     currentSize = size;
     color = c;
     alpha = c.a;
@@ -95,7 +95,7 @@ GuiText::GuiText(const wchar_t * t, int s, GXColor c)
 GuiText::GuiText(const char * t)
 {
     text = NULL;
-    size = presetSize;
+    size = (int) (presetSize * Settings.FontScaleFactor);
     currentSize = size;
     color = presetColor;
     alpha = presetColor.a;
@@ -531,7 +531,7 @@ void GuiText::Draw()
     GXColor c = color;
     c.a = GetAlpha();
 
-    int newSize = (int) (size * GetScale() * Settings.FontScaleFactor);
+    int newSize = (int) (size * GetScale());
 
     if (newSize != currentSize)
     {
diff --git a/source/StartUpProcess.cpp b/source/StartUpProcess.cpp
index 44b10121..7adc5bf2 100644
--- a/source/StartUpProcess.cpp
+++ b/source/StartUpProcess.cpp
@@ -158,6 +158,7 @@ int StartUpProcess::Run(int argc, char *argv[])
 
 int StartUpProcess::Execute()
 {
+	Settings.EntryIOS = IOS_GetVersion();
     SetTextf("Start up\n");
 
     if(IosLoader::LoadAppCios() < 0)
diff --git a/source/banner/OpeningBNR.cpp b/source/banner/OpeningBNR.cpp
index f9eefb62..f2f9434d 100644
--- a/source/banner/OpeningBNR.cpp
+++ b/source/banner/OpeningBNR.cpp
@@ -5,44 +5,6 @@
 #include "utils/uncompress.h"
 #include "OpeningBNR.hpp"
 
-typedef struct _IMD5Header
-{
-    u32 fcc;
-    u32 filesize;
-    u8 zeroes[8];
-    u8 crypto[16];
-} __attribute__((packed)) IMD5Header;
-
-typedef struct _U8Header
-{
-    u32 fcc;
-    u32 rootNodeOffset;
-    u32 headerSize;
-    u32 dataOffset;
-    u8 zeroes[16];
-} __attribute__((packed)) U8Header;
-
-typedef struct _U8Entry
-{
-    struct
-    {
-        u32 fileType :8;
-        u32 nameOffset :24;
-    };
-    u32 fileOffset;
-    union
-    {
-        u32 fileLength;
-        u32 numEntries;
-    };
-} __attribute__( ( packed ) ) U8Entry;
-
-
-static inline const char * u8Filename(const U8Entry *fst, int i)
-{
-    return (char *) (fst + fst[0].numEntries) + fst[i].nameOffset;
-}
-
 BNRInstance * BNRInstance::instance = NULL;
 
 OpeningBNR::OpeningBNR()
diff --git a/source/banner/OpeningBNR.hpp b/source/banner/OpeningBNR.hpp
index 2ec69a22..4419b78f 100644
--- a/source/banner/OpeningBNR.hpp
+++ b/source/banner/OpeningBNR.hpp
@@ -17,6 +17,44 @@ typedef struct _IMETHeader
     u8 crypto[16];
 } __attribute__((packed)) IMETHeader;
 
+typedef struct _IMD5Header
+{
+    u32 fcc;
+    u32 filesize;
+    u8 zeroes[8];
+    u8 crypto[16];
+} __attribute__((packed)) IMD5Header;
+
+typedef struct _U8Header
+{
+    u32 fcc;
+    u32 rootNodeOffset;
+    u32 headerSize;
+    u32 dataOffset;
+    u8 zeroes[16];
+} __attribute__((packed)) U8Header;
+
+typedef struct _U8Entry
+{
+    struct
+    {
+        u32 fileType :8;
+        u32 nameOffset :24;
+    };
+    u32 fileOffset;
+    union
+    {
+        u32 fileLength;
+        u32 numEntries;
+    };
+} __attribute__( ( packed ) ) U8Entry;
+
+
+static inline const char * u8Filename(const U8Entry *fst, int i)
+{
+    return (char *) (fst + fst[0].numEntries) + fst[i].nameOffset;
+}
+
 class OpeningBNR
 {
     public:
diff --git a/source/homebrewboot/BootHomebrew.cpp b/source/homebrewboot/BootHomebrew.cpp
index 33ba5c71..81805bb3 100644
--- a/source/homebrewboot/BootHomebrew.cpp
+++ b/source/homebrewboot/BootHomebrew.cpp
@@ -9,18 +9,25 @@
 #include <vector>
 #include <string>
 #include "Controls/DeviceHandler.hpp"
-#include "../lstub.h"
-#include "../sys.h"
-#include "../gecko.h"
+#include "settings/CSettings.h"
+#include "lstub.h"
+#include "sys.h"
+#include "gecko.h"
 
-#include "dolloader.h"
+#define EXECUTE_ADDR	((u8 *) 0x92000000)
+#define BOOTER_ADDR		((u8 *) 0x93000000)
+#define ARGS_ADDR		((u8 *) 0x93200000)
 
-static u8 *homebrewbuffer = (u8 *) 0x92000000;
+extern const u8 app_booter_bin[];
+extern const u32 app_booter_bin_size;
+
+typedef void (*entrypoint) (void);
+extern "C" { void __exception_closeall(); }
+
+static u8 *homebrewbuffer = EXECUTE_ADDR;
 static u32 homebrewsize = 0;
 static std::vector<std::string> Arguments;
 
-extern const u8 app_booter_dol[];
-
 void AddBootArgument(const char * argv)
 {
     std::string arg(argv);
@@ -37,7 +44,7 @@ int CopyHomebrewMemory(u8 *temp, u32 pos, u32 len)
 
 void FreeHomebrewBuffer()
 {
-    homebrewbuffer = (u8 *) 0x92000000;
+    homebrewbuffer = EXECUTE_ADDR;
     homebrewsize = 0;
 
     Arguments.clear();
@@ -91,18 +98,24 @@ static int RunAppbooter()
 
     ExitApp();
 
+	if(Settings.EntryIOS != IOS_GetVersion())
+    	IOS_ReloadIOS(Settings.EntryIOS);
+
     struct __argv args;
     SetupARGV(&args);
 
     u32 cpu_isr;
 
-    entrypoint entry = (entrypoint) load_dol((void*) app_booter_dol, &args);
+	memcpy(BOOTER_ADDR, app_booter_bin, app_booter_bin_size);
+	DCFlushRange(BOOTER_ADDR, app_booter_bin_size);
 
-    if (!entry)
-    {
-        FreeHomebrewBuffer();
-        return -1;
-    }
+    entrypoint entry = (entrypoint) BOOTER_ADDR;
+
+	if (args.argvMagic == ARGV_MAGIC)
+	{
+		memmove(ARGS_ADDR, &args, sizeof(args));
+		DCFlushRange(ARGS_ADDR, sizeof(args));
+	}
 
     u64 currentStub = getStubDest();
     loadStub();
diff --git a/source/homebrewboot/dolloader.c b/source/homebrewboot/dolloader.c
deleted file mode 100644
index d957f7e8..00000000
--- a/source/homebrewboot/dolloader.c
+++ /dev/null
@@ -1,64 +0,0 @@
-#include <malloc.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <ogc/machine/processor.h>
-#include <gccore.h>
-#include <dirent.h>
-#include <string.h>
-
-#include "dolloader.h"
-
-typedef struct _dolheader {
-	u32 text_pos[7];
-	u32 data_pos[11];
-	u32 text_start[7];
-	u32 data_start[11];
-	u32 text_size[7];
-	u32 data_size[11];
-	u32 bss_start;
-	u32 bss_size;
-	u32 entry_point;
-} dolheader;
-
-u32 load_dol(const void *dolstart, struct __argv *argv)
-{
-	u32 i;
-	dolheader *dolfile;
-
-	if (dolstart)
-	{
-		dolfile = (dolheader *) dolstart;
-		for (i = 0; i < 7; i++)
-		{
-			if ((!dolfile->text_size[i]) || (dolfile->text_start[i] < 0x100))
-				continue;
-
-			memmove((void *) dolfile->text_start[i], dolstart
-				+ dolfile->text_pos[i], dolfile->text_size[i]);
-
-			DCFlushRange ((void *) dolfile->text_start[i], dolfile->text_size[i]);
-			ICInvalidateRange((void *) dolfile->text_start[i], dolfile->text_size[i]);
-		}
-
-		for (i = 0; i < 11; i++)
-		{
-			if ((!dolfile->data_size[i]) || (dolfile->data_start[i] < 0x100))
-				continue;
-
-			memmove((void *) dolfile->data_start[i], dolstart
-					+ dolfile->data_pos[i], dolfile->data_size[i]);
-
-			DCFlushRange((void *) dolfile->data_start[i],
-					dolfile->data_size[i]);
-		}
-
-		if (argv && argv->argvMagic == ARGV_MAGIC)
-		{
-			void *new_argv = (void *) (dolfile->entry_point + 8);
-			memmove(new_argv, argv, sizeof(*argv));
-			DCFlushRange(new_argv, sizeof(*argv));
-		}
-		return dolfile->entry_point;
-	}
-	return 0;
-}
diff --git a/source/homebrewboot/dolloader.h b/source/homebrewboot/dolloader.h
deleted file mode 100644
index af644414..00000000
--- a/source/homebrewboot/dolloader.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef _DOLLOADER_H_
-#define _DOLLOADER_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern void __exception_closeall();
-typedef void (*entrypoint) (void);
-
-u32 load_dol(const void *dolstart, struct __argv *argv);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/source/prompts/PromptWindows.cpp b/source/prompts/PromptWindows.cpp
index 4fe57648..db2be1f2 100644
--- a/source/prompts/PromptWindows.cpp
+++ b/source/prompts/PromptWindows.cpp
@@ -29,8 +29,7 @@
 #include "utils/StringTools.h"
 #include "mload/mload.h"
 #include "FileOperations/fileops.h"
-#include "menu.h"
-#include "menu.h"
+#include "menu/menus.h"
 #include "sys.h"
 #include "wpad.h"
 #include "wad/wad.h"
@@ -42,11 +41,6 @@
 #include "gecko.h"
 #include "lstub.h"
 
-/*** Extern variables ***/
-s32 gameStart = 0;
-extern u8 shutdown;
-extern u8 reset;
-
 /****************************************************************************
  * OnScreenNumpad
  *
@@ -237,9 +231,9 @@ void WindowCredits()
 
     char SvnRev[80];
 #ifdef FULLCHANNEL
-    snprintf(SvnRev, sizeof(SvnRev), "V2.2c   IOS%u (Rev %u)", IOS_GetVersion(), IOS_GetRevision());
+    snprintf(SvnRev, sizeof(SvnRev), "Rev%sc   IOS%u (Rev %u)", GetRev(), IOS_GetVersion(), IOS_GetRevision());
 #else
-    snprintf(SvnRev, sizeof(SvnRev), "V2.2   IOS%u (Rev %u)", IOS_GetVersion(), IOS_GetRevision());
+    snprintf(SvnRev, sizeof(SvnRev), "Rev%s   IOS%u (Rev %u)", GetRev(), IOS_GetVersion(), IOS_GetRevision());
 #endif
 
     char IosInfo[80] = "";
diff --git a/source/prompts/gameinfo.cpp b/source/prompts/gameinfo.cpp
index 1dc4a8d2..7fc6555a 100644
--- a/source/prompts/gameinfo.cpp
+++ b/source/prompts/gameinfo.cpp
@@ -1114,13 +1114,10 @@ bool save_gamelist(int txt) // save gamelist
         {
             struct discHdr* header = gameList[i];
             WBFS_GameSize(header->id, &size);
-            if (i < 500)
-            {
-                fprintf(f, "%c%c%c%c%c%c", header->id[0], header->id[1], header->id[2], header->id[3], header->id[4],
-                        header->id[5]);
-                fprintf(f, " [%.2f]   ", size);
-                fprintf(f, " %s", GameTitles.GetTitle(header));
-            }
+			fprintf(f, "%c%c%c%c%c%c", header->id[0], header->id[1], header->id[2], header->id[3], header->id[4],
+					header->id[5]);
+			fprintf(f, " [%.2f]   ", size);
+			fprintf(f, " %s", GameTitles.GetTitle(header));
             fprintf(f, "\n");
         }
     }
@@ -1132,11 +1129,8 @@ bool save_gamelist(int txt) // save gamelist
         {
             struct discHdr* header = gameList[i];
             WBFS_GameSize(header->id, &size);
-            if (i < 500)
-            {
-                fprintf(f, "\"%c%c%c%c%c%c\",\"%.2f\",\"%s\"\n", header->id[0], header->id[1], header->id[2],
-                        header->id[3], header->id[4], header->id[5], size, GameTitles.GetTitle(header));
-            }
+			fprintf(f, "\"%c%c%c%c%c%c\",\"%.2f\",\"%s\"\n", header->id[0], header->id[1], header->id[2],
+					header->id[3], header->id[4], header->id[5], size, GameTitles.GetTitle(header));
         }
     }
     fclose(f);
diff --git a/source/settings/CSettings.cpp b/source/settings/CSettings.cpp
index af832db4..f0dd4e68 100644
--- a/source/settings/CSettings.cpp
+++ b/source/settings/CSettings.cpp
@@ -119,7 +119,7 @@ void CSettings::SetDefault()
     USBPort = 0;
     CacheTitles = ON;
     WSFactor = 0.8f; //actually should be 0.75 for real widescreen
-    FontScaleFactor = 1.0f;
+    FontScaleFactor = 0.8f; //it's a work around to not have to change ALL fonts now
     EnabledCategories.resize(1);
     EnabledCategories[0] = 0;
     Wiinnertag = OFF;
diff --git a/source/settings/CSettings.h b/source/settings/CSettings.h
index 3f5a9dc4..dbcf6f33 100644
--- a/source/settings/CSettings.h
+++ b/source/settings/CSettings.h
@@ -125,6 +125,7 @@ class CSettings
         short GameListOffset;
         short sneekVideoPatch;
         std::vector<u32> EnabledCategories;
+        u8 EntryIOS;
     protected:
         bool ValidVersion(FILE * file);
         bool SetSetting(char *name, char *value);
diff --git a/source/themes/CTheme.cpp b/source/themes/CTheme.cpp
index b3763586..2326bf07 100644
--- a/source/themes/CTheme.cpp
+++ b/source/themes/CTheme.cpp
@@ -29,13 +29,27 @@
 #include "CTheme.h"
 #include "GUI/gui.h"
 #include "settings/CSettings.h"
+#include "banner/OpeningBNR.hpp"
 #include "FileOperations/fileops.h"
 #include "menu/menus.h"
+#include "wad/nandtitle.h"
 #include "FreeTypeGX.h"
 
+typedef struct map_entry
+{
+	char name[8];
+	u8 hash[20];
+} __attribute__((packed)) map_entry_t;
+
+static const char contentMapPath[] ATTRIBUTE_ALIGN(32) = "/shared1/content.map";
+static const u8 WIIFONT_HASH[]		= {0x32, 0xb3, 0x39, 0xcb, 0xbb, 0x50, 0x7d, 0x50, 0x27, 0x79, 0x25, 0x9a, 0x78, 0x66, 0x99, 0x5d, 0x03, 0x0b, 0x1d, 0x88};
+static const u8 WIIFONT_HASH_KOR[]	= {0xb7, 0x15, 0x6d, 0xf0, 0xf4, 0xae, 0x07, 0x8f, 0xd1, 0x53, 0x58, 0x3e, 0x93, 0x6e, 0x07, 0xc0, 0x98, 0x77, 0x49, 0x0e};
+
 FreeTypeGX * fontSystem = NULL;
-static FT_Byte * MainFont = NULL;
-static u32 MainFontSize = 0;
+static FT_Byte * systemFont = NULL;
+static u32 systemFontSize = 0;
+static FT_Byte * customFont = NULL;
+static u32 customFontSize = 0;
 
 bool Theme::ShowTooltips = true;
 
@@ -149,13 +163,76 @@ bool Theme::Load(const char * theme_file_path)
     return result;
 }
 
+bool Theme::loadSystemFont(bool korean)
+{
+	u8 *contentMap = NULL;
+	u32 mapsize = 0;
+
+	NandTitle::LoadFileFromNand(contentMapPath, &contentMap, &mapsize);
+	if(!contentMap)
+		return false;
+
+	int fileCount = mapsize / sizeof(map_entry_t);
+
+	map_entry_t *mapEntryList = (map_entry_t *) contentMap;
+
+	for (int i = 0; i < fileCount; i++)
+	{
+		if (memcmp(mapEntryList[i].hash, korean ? WIIFONT_HASH_KOR : WIIFONT_HASH, 20) != 0)
+			continue;
+
+		// Name found, load it and unpack it
+		char font_filename[32] ATTRIBUTE_ALIGN(32);
+		snprintf(font_filename, sizeof(font_filename), "/shared1/%.8s.app", mapEntryList[i].name);
+
+		u8 *fontArchive = NULL;
+		u32 filesize = 0;
+
+		NandTitle::LoadFileFromNand(font_filename, &fontArchive, &filesize);
+		if(!fontArchive)
+			continue;
+
+		const U8Header *u8Archive = (U8Header *) fontArchive;
+		const U8Entry *fst = (const U8Entry *) (((const u8 *) u8Archive) + u8Archive->rootNodeOffset);
+
+		if(fst[0].numEntries < 1)
+		{
+			free(fontArchive);
+			continue;
+		}
+
+		if(systemFont)
+			delete [] systemFont;
+
+		systemFontSize = fst[1].fileLength;
+		systemFont = new (std::nothrow) FT_Byte[systemFontSize];
+		if(!systemFont)
+		{
+			free(fontArchive);
+			continue;
+		}
+
+		memcpy(systemFont, fontArchive + fst[1].fileOffset, systemFontSize);
+
+		free(fontArchive);
+		free(contentMap);
+		gprintf("Loaded Wii System Font: %s\n", u8Filename(fst, 1));
+		return true;
+	}
+
+	free(contentMap);
+
+	return false;
+}
+
 bool Theme::LoadFont(const char *path)
 {
     char FontPath[300];
     bool result = false;
     FILE *pfile = NULL;
 
-    ClearFontData();
+	delete [] customFont;
+	customFont = NULL;
 
     snprintf(FontPath, sizeof(FontPath), "%s/font.ttf", path);
 
@@ -164,22 +241,32 @@ bool Theme::LoadFont(const char *path)
     if (pfile)
     {
         fseek(pfile, 0, SEEK_END);
-        MainFontSize = ftell(pfile);
+        customFontSize = ftell(pfile);
         rewind(pfile);
 
-        MainFont = new (std::nothrow) FT_Byte[MainFontSize];
-        if (MainFont)
+        customFont = new (std::nothrow) FT_Byte[customFontSize];
+        if (customFont)
         {
-            fread(MainFont, 1, MainFontSize, pfile);
+            fread(customFont, 1, customFontSize, pfile);
             result = true;
         }
         fclose(pfile);
     }
 
-    FT_Byte * loadedFont = MainFont ? MainFont : (FT_Byte *) Resources::GetFile("font.ttf");
-    u32 loadedFontSize = MainFont ? MainFontSize : Resources::GetFileSize("font.ttf");
+	FT_Byte *loadedFont = customFont;
+	u32 loadedFontSize = customFontSize;
 
-    fontSystem = new FreeTypeGX(loadedFont, loadedFontSize);
+	if(!loadedFont)
+	{
+		if(!systemFont)
+			loadSystemFont(CONF_GetLanguage() == CONF_LANG_KOREAN);
+
+		//! Default to system font if no custom is loaded
+		loadedFont = systemFont;
+		loadedFontSize = systemFontSize;
+	}
+
+    fontSystem = new FreeTypeGX(loadedFont, loadedFontSize, loadedFont == systemFont);
 
     return result;
 }
@@ -190,7 +277,11 @@ void Theme::ClearFontData()
         delete fontSystem;
     fontSystem = NULL;
 
-    if (MainFont)
-        delete [] MainFont;
-    MainFont = NULL;
+	if(customFont)
+    	delete [] customFont;
+	customFont = NULL;
+
+    if (systemFont)
+        delete [] systemFont;
+    systemFont = NULL;
 }
diff --git a/source/themes/CTheme.h b/source/themes/CTheme.h
index 5a7304ea..ecfe6aac 100644
--- a/source/themes/CTheme.h
+++ b/source/themes/CTheme.h
@@ -24,6 +24,8 @@ class Theme
         //!Enable tooltips: special case treaded because it is called every frame
         static bool ShowTooltips;
     private:
+    	//!Load the original Wii System Menu font
+		static bool loadSystemFont(bool korean);
         //!Clear the font data and free the memory
         static void ClearFontData();
 };
diff --git a/source/themes/filelist.h b/source/themes/filelist.h
index d05fe8ac..c8c41261 100644
--- a/source/themes/filelist.h
+++ b/source/themes/filelist.h
@@ -1,7 +1,7 @@
 /****************************************************************************
  * USB Loader GX resource files.
  * This file is generated automatically.
- * Includes 189 files.
+ * Includes 188 files.
  *
  * NOTE:
  * Any manual modification of this file will be overwriten by the generation.
@@ -575,9 +575,6 @@ extern const u32 success_ogg_size;
 extern const u8 clock_ttf[];
 extern const u32 clock_ttf_size;
 
-extern const u8 font_ttf[];
-extern const u32 font_ttf_size;
-
 RecourceFile Resources::RecourceFiles[] =
 {
 	{"abcIcon.png", abcIcon_png, abcIcon_png_size, NULL, 0},
@@ -768,7 +765,6 @@ RecourceFile Resources::RecourceFiles[] =
 	{"menuout.ogg", menuout_ogg, menuout_ogg_size, NULL, 0},
 	{"success.ogg", success_ogg, success_ogg_size, NULL, 0},
 	{"clock.ttf", clock_ttf, clock_ttf_size, NULL, 0},
-	{"font.ttf", font_ttf, font_ttf_size, NULL, 0},
 	{NULL, NULL, 0, NULL, 0}
 };
 
diff --git a/source/usbloader/frag.c b/source/usbloader/frag.c
index 700057f8..e03f1009 100644
--- a/source/usbloader/frag.c
+++ b/source/usbloader/frag.c
@@ -282,9 +282,9 @@ int set_frag_list(u8 *id)
 		return ret;
 
 	// verify id matches
-	char discid[8];
+	char discid[32] ATTRIBUTE_ALIGN(32);
 	memset(discid, 0, sizeof(discid));
-	ret = WDVD_UnencryptedRead(discid, 8, 0);
+	ret = WDVD_UnencryptedRead(discid, 32, 0);
 	gprintf("Reading ID after setting fraglist: %s (expected: %s)\n", discid, id);
 	return (strncasecmp((char *) id, discid, 6) != 0) ? -3 : 0;
 }
diff --git a/svnrev.sh b/svnrev.sh
index 6dcd149d..ea571a3c 100644
--- a/svnrev.sh
+++ b/svnrev.sh
@@ -50,7 +50,7 @@ EOF
                 <arg>--ios=250</arg>
                 <arg>--usbport=0</arg>
         </arguments>
-        -->  // remove this line to enable arguments
+        // remove this line to enable arguments -->
 		<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.