From f8c169280936a44c4a8f148b1b008f226e46ebac Mon Sep 17 00:00:00 2001
From: dimok321 <15055714+dimok789@users.noreply.github.com>
Date: Fri, 24 Sep 2010 13:46:32 +0000
Subject: [PATCH] little optimization

---
 HBC/META.XML                    |   4 +-
 gui.pnproj                      |   2 +-
 gui.pnps                        |   2 +-
 source/fatmounter.h             |  44 +++----
 source/lstub.cpp                |   2 +-
 source/main.cpp                 |   6 +-
 source/menu.cpp                 |   4 +-
 source/prompts/TitleBrowser.cpp |  60 ++++-----
 source/settings/Settings.cpp    |  12 +-
 source/system/IosLoader.cpp     | 215 +++++++++++++++-----------------
 source/system/IosLoader.h       |  32 ++---
 source/wad/nandtitle.cpp        |   2 +
 source/wad/nandtitle.h          |   3 +-
 source/wad/wad.cpp              |   2 +-
 14 files changed, 186 insertions(+), 204 deletions(-)

diff --git a/HBC/META.XML b/HBC/META.XML
index 59b450fe..0b2c1924 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>1.0 r966</version>
-		<release_date>201009241157</release_date>
+		<version>1.0 r967</version>
+		<release_date>201009241313</release_date>
 		<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.
 The interactive GUI is completely controllable with WiiMote, Classic Controller or GC Controller.
diff --git a/gui.pnproj b/gui.pnproj
index 172a1b4d..6e426dc1 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="banner.c"></File><File path="banner.h"></File><File path="gui_banner.cpp"></File><File path="gui_banner.h"></File><File path="MD5.c"></File><File path="MD5.h"></File><File path="openingbnr.c"></File><File path="openingbnr.h"></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="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="HomebrewFiles.cpp"></File><File path="HomebrewFiles.h"></File><File path="HomebrewXML.cpp"></File><File path="HomebrewXML.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="arrangeGrid.png"></File><File path="arrangeList.png"></File><File path="arrow_next.png"></File><File path="arrow_previous.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="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_install.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="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="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="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="mp3_pause.png"></File><File path="mp3_stop.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="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="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="settings_background.png"></File><File path="settings_button.png"></File><File path="settings_button_over.png"></File><File path="settings_menu_button.png"></File><File path="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="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="libfat" path="libfat\"><File path="bit_ops.h"></File><File path="cache.h"></File><File path="common.h"></File><File path="directory.c"></File><File path="directory.h"></File><File path="disc.h"></File><File path="disc_fat.c"></File><File path="disc_fat.h"></File><File path="fat.h"></File><File path="fatdir.c"></File><File path="fatdir.h"></File><File path="fatfile.c"></File><File path="fatfile.h"></File><File path="fat_cache.c"></File><File path="fat_cache.h"></File><File path="filetime.c"></File><File path="filetime.h"></File><File path="file_allocation_table.c"></File><File path="file_allocation_table.h"></File><File path="libfat.c"></File><File path="libfatversion.h"></File><File path="lock.h"></File><File path="mem_allocate.h"></File><File path="partition.c"></File><File path="partition.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libntfs" path="libntfs\"><File path="acls.c"></File><File path="acls.h"></File><File path="attrib.c"></File><File path="attrib.h"></File><File path="attrib_frag.c"></File><File path="attrlist.c"></File><File path="attrlist.h"></File><File path="bitmap.c"></File><File path="bitmap.h"></File><File path="bit_ops.h"></File><File path="bootsect.c"></File><File path="bootsect.h"></File><File path="cache.c"></File><File path="cache.h"></File><File path="cache2.c"></File><File path="cache2.h"></File><File path="collate.c"></File><File path="collate.h"></File><File path="compat.c"></File><File path="compat.h"></File><File path="compress.c"></File><File path="compress.h"></File><File path="config.h"></File><File path="debug.c"></File><File path="debug.h"></File><File path="device.c"></File><File path="device.h"></File><File path="device_io.c"></File><File path="device_io.h"></File><File path="dir.c"></File><File path="dir.h"></File><File path="efs.c"></File><File path="efs.h"></File><File path="endians.h"></File><File path="gekko_io.c"></File><File path="gekko_io.h"></File><File path="index.c"></File><File path="index.h"></File><File path="inode.c"></File><File path="inode.h"></File><File path="layout.h"></File><File path="lcnalloc.c"></File><File path="lcnalloc.h"></File><File path="logfile.c"></File><File path="logfile.h"></File><File path="logging.c"></File><File path="logging.h"></File><File path="mem_allocate.h"></File><File path="mft.c"></File><File path="mft.h"></File><File path="misc.c"></File><File path="misc.h"></File><File path="mst.c"></File><File path="mst.h"></File><File path="ntfs.c"></File><File path="ntfs.h"></File><File path="ntfsdir.c"></File><File path="ntfsdir.h"></File><File path="ntfsfile.c"></File><File path="ntfsfile.h"></File><File path="ntfsfile_frag.c"></File><File path="ntfsinternal.c"></File><File path="ntfsinternal.h"></File><File path="ntfstime.h"></File><File path="object_id.c"></File><File path="object_id.h"></File><File path="param.h"></File><File path="reparse.c"></File><File path="reparse.h"></File><File path="runlist.c"></File><File path="runlist.h"></File><File path="security.c"></File><File path="security.h"></File><File path="support.h"></File><File path="types.h"></File><File path="unistr.c"></File><File path="unistr.h"></File><File path="volume.c"></File><File path="volume.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 excludeFolders="CVS;.svn" filter="*" name="libwiigui" path="libwiigui\"><File path="gui.h"></File><File path="gui_bgm.cpp"></File><File path="gui_bgm.h"></File><File path="gui_button.cpp"></File><File path="gui_customoptionbrowser.cpp"></File><File path="gui_customoptionbrowser.h"></File><File path="gui_diskcover.cpp"></File><File path="gui_diskcover.h"></File><File path="gui_element.cpp"></File><File path="gui_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_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_sound.cpp"></File><File path="gui_sound_decoder.h"></File><File path="gui_sound_decoder_aiff.cpp"></File><File path="gui_sound_decoder_bns.cpp"></File><File path="gui_sound_decoder_mpg.cpp"></File><File path="gui_sound_decoder_ogg.cpp"></File><File path="gui_sound_decoder_wav.cpp"></File><File path="gui_text.cpp"></File><File path="gui_tooltip.cpp"></File><File path="gui_trigger.cpp"></File><File path="gui_window.cpp"></File><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></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="menu" path="menu\"><File path="menus.h"></File><File path="menu_check.cpp"></File><File path="menu_disclist.cpp"></File><File path="menu_format.cpp"></File><File path="menu_install.cpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="mload" path="mload\"><File path="dip_plugin.c"></File><File path="dip_plugin.h"></File><File path="fatffs_util.c"></File><File path="fatffs_util.h"></File><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="HTML_Stream.cpp"></File><File path="HTML_Stream.h"></File><File path="http.c"></File><File path="http.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.c"></File><File path="wip.cpp"></File><File path="wip.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="prompts" path="prompts\"><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="ProgressWindow.cpp"></File><File path="ProgressWindow.h"></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="ramdisk" path="ramdisk\"><File path="ramdisk.cpp"></File><File path="ramdisk.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="settings" path="settings\"><File path="cfg.c"></File><File path="cfg.h"></File><File path="CSettings.cpp"></File><File path="CSettings.h"></File><File path="newtitles.cpp"></File><File path="newtitles.h"></File><File path="Settings.cpp"></File><File path="Settings.h"></File><File path="SettingsPrompts.cpp"></File><File path="SettingsPrompts.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="sounds" path="sounds\"><File path="bg_music.ogg"></File><File path="button_click.pcm"></File><File path="button_click2.pcm"></File><File path="button_over.pcm"></File><File path="credits_music.ogg"></File><File path="menuin.ogg"></File><File path="menuout.ogg"></File><File path="success.ogg"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="themes" path="themes\"><File path="Theme_Downloader.cpp"></File><File path="Theme_Downloader.h"></File><File path="Theme_List.cpp"></File><File path="Theme_List.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="unzip" path="unzip\"><File path="crypt.h"></File><File path="inflate.c"></File><File path="inflate.h"></File><File path="ioapi.c"></File><File path="ioapi.h"></File><File path="miniunz.c"></File><File path="miniunz.h"></File><File path="mztools.c"></File><File path="mztools.h"></File><File path="unzip.c"></File><File path="unzip.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_fat.cpp"></File><File path="wbfs_fat.h"></File><File path="wbfs_ntfs.cpp"></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="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="GameList.cpp"></File><File path="GameList.h"></File><File path="partition_usbloader.c"></File><File path="partition_usbloader.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="wdvd.c"></File><File path="wdvd.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="xml.cpp"></File><File path="xml.h"></File></MagicFolder><File path="audio.cpp"></File><File path="audio.h"></File><File path="bannersound.cpp"></File><File path="bannersound.h"></File><File path="buildtype.h"></File><File path="data1"></File><File path="fatmounter.c"></File><File path="fatmounter.h"></File><File path="filelist.h"></File><File path="FontSystem.cpp"></File><File path="FontSystem.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="listfiles.c"></File><File path="listfiles.h"></File><File path="lstub.cpp"></File><File path="lstub.h"></File><File path="main.cpp"></File><File path="main.h"></File><File path="memory.h"></File><File path="menu.cpp"></File><File path="menu.h"></File><File path="stub.S"></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></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="banner.c"></File><File path="banner.h"></File><File path="gui_banner.cpp"></File><File path="gui_banner.h"></File><File path="MD5.c"></File><File path="MD5.h"></File><File path="openingbnr.c"></File><File path="openingbnr.h"></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="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="HomebrewFiles.cpp"></File><File path="HomebrewFiles.h"></File><File path="HomebrewXML.cpp"></File><File path="HomebrewXML.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="arrangeGrid.png"></File><File path="arrangeList.png"></File><File path="arrow_next.png"></File><File path="arrow_previous.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="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_install.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="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="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="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="mp3_pause.png"></File><File path="mp3_stop.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="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="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="settings_background.png"></File><File path="settings_button.png"></File><File path="settings_button_over.png"></File><File path="settings_menu_button.png"></File><File path="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="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="libfat" path="libfat\"><File path="bit_ops.h"></File><File path="cache.h"></File><File path="common.h"></File><File path="directory.c"></File><File path="directory.h"></File><File path="disc.h"></File><File path="disc_fat.c"></File><File path="disc_fat.h"></File><File path="fat.h"></File><File path="fatdir.c"></File><File path="fatdir.h"></File><File path="fatfile.c"></File><File path="fatfile.h"></File><File path="fat_cache.c"></File><File path="fat_cache.h"></File><File path="filetime.c"></File><File path="filetime.h"></File><File path="file_allocation_table.c"></File><File path="file_allocation_table.h"></File><File path="libfat.c"></File><File path="libfatversion.h"></File><File path="lock.h"></File><File path="mem_allocate.h"></File><File path="partition.c"></File><File path="partition.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libntfs" path="libntfs\"><File path="acls.c"></File><File path="acls.h"></File><File path="attrib.c"></File><File path="attrib.h"></File><File path="attrib_frag.c"></File><File path="attrlist.c"></File><File path="attrlist.h"></File><File path="bitmap.c"></File><File path="bitmap.h"></File><File path="bit_ops.h"></File><File path="bootsect.c"></File><File path="bootsect.h"></File><File path="cache.c"></File><File path="cache.h"></File><File path="cache2.c"></File><File path="cache2.h"></File><File path="collate.c"></File><File path="collate.h"></File><File path="compat.c"></File><File path="compat.h"></File><File path="compress.c"></File><File path="compress.h"></File><File path="config.h"></File><File path="debug.c"></File><File path="debug.h"></File><File path="device.c"></File><File path="device.h"></File><File path="device_io.c"></File><File path="device_io.h"></File><File path="dir.c"></File><File path="dir.h"></File><File path="efs.c"></File><File path="efs.h"></File><File path="endians.h"></File><File path="gekko_io.c"></File><File path="gekko_io.h"></File><File path="index.c"></File><File path="index.h"></File><File path="inode.c"></File><File path="inode.h"></File><File path="layout.h"></File><File path="lcnalloc.c"></File><File path="lcnalloc.h"></File><File path="logfile.c"></File><File path="logfile.h"></File><File path="logging.c"></File><File path="logging.h"></File><File path="mem_allocate.h"></File><File path="mft.c"></File><File path="mft.h"></File><File path="misc.c"></File><File path="misc.h"></File><File path="mst.c"></File><File path="mst.h"></File><File path="ntfs.c"></File><File path="ntfs.h"></File><File path="ntfsdir.c"></File><File path="ntfsdir.h"></File><File path="ntfsfile.c"></File><File path="ntfsfile.h"></File><File path="ntfsfile_frag.c"></File><File path="ntfsinternal.c"></File><File path="ntfsinternal.h"></File><File path="ntfstime.h"></File><File path="object_id.c"></File><File path="object_id.h"></File><File path="param.h"></File><File path="reparse.c"></File><File path="reparse.h"></File><File path="runlist.c"></File><File path="runlist.h"></File><File path="security.c"></File><File path="security.h"></File><File path="support.h"></File><File path="types.h"></File><File path="unistr.c"></File><File path="unistr.h"></File><File path="volume.c"></File><File path="volume.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 excludeFolders="CVS;.svn" filter="*" name="libwiigui" path="libwiigui\"><File path="gui.h"></File><File path="gui_bgm.cpp"></File><File path="gui_bgm.h"></File><File path="gui_button.cpp"></File><File path="gui_customoptionbrowser.cpp"></File><File path="gui_customoptionbrowser.h"></File><File path="gui_diskcover.cpp"></File><File path="gui_diskcover.h"></File><File path="gui_element.cpp"></File><File path="gui_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_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_sound.cpp"></File><File path="gui_sound_decoder.h"></File><File path="gui_sound_decoder_aiff.cpp"></File><File path="gui_sound_decoder_bns.cpp"></File><File path="gui_sound_decoder_mpg.cpp"></File><File path="gui_sound_decoder_ogg.cpp"></File><File path="gui_sound_decoder_wav.cpp"></File><File path="gui_text.cpp"></File><File path="gui_tooltip.cpp"></File><File path="gui_trigger.cpp"></File><File path="gui_window.cpp"></File><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></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="menu" path="menu\"><File path="menus.h"></File><File path="menu_check.cpp"></File><File path="menu_disclist.cpp"></File><File path="menu_format.cpp"></File><File path="menu_install.cpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="mload" path="mload\"><File path="dip_plugin.c"></File><File path="dip_plugin.h"></File><File path="fatffs_util.c"></File><File path="fatffs_util.h"></File><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="HTML_Stream.cpp"></File><File path="HTML_Stream.h"></File><File path="http.c"></File><File path="http.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.c"></File><File path="wip.cpp"></File><File path="wip.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="prompts" path="prompts\"><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="ProgressWindow.cpp"></File><File path="ProgressWindow.h"></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="ramdisk" path="ramdisk\"><File path="ramdisk.cpp"></File><File path="ramdisk.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="settings" path="settings\"><File path="cfg.c"></File><File path="cfg.h"></File><File path="CSettings.cpp"></File><File path="CSettings.h"></File><File path="newtitles.cpp"></File><File path="newtitles.h"></File><File path="Settings.cpp"></File><File path="Settings.h"></File><File path="SettingsPrompts.cpp"></File><File path="SettingsPrompts.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="sounds" path="sounds\"><File path="bg_music.ogg"></File><File path="button_click.pcm"></File><File path="button_click2.pcm"></File><File path="button_over.pcm"></File><File path="credits_music.ogg"></File><File path="menuin.ogg"></File><File path="menuout.ogg"></File><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="Theme_Downloader.cpp"></File><File path="Theme_Downloader.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_fat.cpp"></File><File path="wbfs_fat.h"></File><File path="wbfs_ntfs.cpp"></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="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="GameList.cpp"></File><File path="GameList.h"></File><File path="partition_usbloader.c"></File><File path="partition_usbloader.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="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></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="xml.cpp"></File><File path="xml.h"></File></MagicFolder><File path="audio.cpp"></File><File path="audio.h"></File><File path="bannersound.cpp"></File><File path="bannersound.h"></File><File path="buildtype.h"></File><File path="data1"></File><File path="fatmounter.c"></File><File path="fatmounter.h"></File><File path="filelist.h"></File><File path="FontSystem.cpp"></File><File path="FontSystem.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="listfiles.c"></File><File path="listfiles.h"></File><File path="lstub.cpp"></File><File path="lstub.h"></File><File path="main.cpp"></File><File path="main.h"></File><File path="memory.h"></File><File path="menu.cpp"></File><File path="menu.h"></File><File path="stub.S"></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></Project>
\ No newline at end of file
diff --git a/gui.pnps b/gui.pnps
index 37a2c6da..4814308e 100644
--- a/gui.pnps
+++ b/gui.pnps
@@ -1 +1 @@
-<pd><ViewState><e p="gui\source\mload" x="false"></e><e p="gui\source\settings" x="false"></e><e p="gui\source\images" x="false"></e><e p="gui\source\libfat" x="false"></e><e p="gui\source\prompts" x="false"></e><e p="gui\source\banner" x="false"></e><e p="gui\source\cheats" x="false"></e><e p="gui\source\libntfs" x="false"></e><e p="gui\source\network" x="true"></e><e p="gui\source\fonts" x="false"></e><e p="gui\source\menu" x="false"></e><e p="gui\source\ramdisk" x="false"></e><e p="gui\source\sounds" x="false"></e><e p="gui\source\wad" x="false"></e><e p="gui" x="true"></e><e p="gui\source\homebrewboot" x="false"></e><e p="gui\source\language" x="false"></e><e p="gui\source" x="true"></e><e p="gui\source\libwbfs" x="false"></e><e p="gui\source\libwiigui" x="false"></e><e p="gui\source\patches" x="false"></e><e p="gui\source\themes" x="false"></e><e p="gui\source\memory" x="false"></e><e p="gui\source\unzip" x="false"></e><e p="gui\source\usbloader" x="false"></e><e p="gui\source\xml" x="false"></e></ViewState></pd>
\ No newline at end of file
+<pd><ViewState><e p="gui\source\mload" x="false"></e><e p="gui\source\settings" x="false"></e><e p="gui\source\utils" x="false"></e><e p="gui\source\images" x="false"></e><e p="gui\source\libfat" x="false"></e><e p="gui\source\prompts" x="false"></e><e p="gui\source\banner" x="false"></e><e p="gui\source\cheats" x="false"></e><e p="gui\source\libntfs" x="false"></e><e p="gui\source\network" x="true"></e><e p="gui\source\fonts" x="false"></e><e p="gui\source\menu" x="false"></e><e p="gui\source\ramdisk" x="false"></e><e p="gui\source\sounds" x="false"></e><e p="gui\source\system" x="false"></e><e p="gui\source\wad" x="false"></e><e p="gui" x="true"></e><e p="gui\source\homebrewboot" x="false"></e><e p="gui\source\language" x="false"></e><e p="gui\source" x="true"></e><e p="gui\source\libwbfs" x="false"></e><e p="gui\source\libwiigui" x="false"></e><e p="gui\source\patches" x="false"></e><e p="gui\source\themes" x="false"></e><e p="gui\source\memory" x="false"></e><e p="gui\source\usbloader" x="false"></e><e p="gui\source\xml" x="false"></e></ViewState></pd>
\ No newline at end of file
diff --git a/source/fatmounter.h b/source/fatmounter.h
index 79a00034..15dd2368 100644
--- a/source/fatmounter.h
+++ b/source/fatmounter.h
@@ -6,30 +6,32 @@ extern "C"
 {
 #endif
 
-    extern int fat_sd_mount;
-    extern sec_t fat_sd_sec;
-    extern int fat_usb_mount;
-    extern sec_t fat_usb_sec;
-    extern int fat_wbfs_mount;
-    extern sec_t fat_wbfs_sec;
+#include <gccore.h>
 
-    int USBDevice_Init();
-    void USBDevice_deInit();
-    int WBFSDevice_Init(u32 sector);
-    void WBFSDevice_deInit();
-    int isInserted(const char *path);
-    int SDCard_Init();
-    void SDCard_deInit();
+extern int fat_sd_mount;
+extern sec_t fat_sd_sec;
+extern int fat_usb_mount;
+extern sec_t fat_usb_sec;
+extern int fat_wbfs_mount;
+extern sec_t fat_wbfs_sec;
 
-    s32 MountNTFS(u32 sector);
-    s32 UnmountNTFS(void);
+int USBDevice_Init();
+void USBDevice_deInit();
+int WBFSDevice_Init(u32 sector);
+void WBFSDevice_deInit();
+int isInserted(const char *path);
+int SDCard_Init();
+void SDCard_deInit();
 
-    extern int fat_usb_mount;
-    extern sec_t fat_usb_sec;
-    extern int fat_wbfs_mount;
-    extern sec_t fat_wbfs_sec;
-    extern int fs_ntfs_mount;
-    extern sec_t fs_ntfs_sec;
+s32 MountNTFS(u32 sector);
+s32 UnmountNTFS(void);
+
+extern int fat_usb_mount;
+extern sec_t fat_usb_sec;
+extern int fat_wbfs_mount;
+extern sec_t fat_wbfs_sec;
+extern int fs_ntfs_mount;
+extern sec_t fs_ntfs_sec;
 
 #ifdef __cplusplus
 }
diff --git a/source/lstub.cpp b/source/lstub.cpp
index fc78b35e..1b65b417 100644
--- a/source/lstub.cpp
+++ b/source/lstub.cpp
@@ -29,7 +29,7 @@ static char* determineStubTIDLocation()
 
 s32 Set_Stub(u64 reqID)
 {
-    if (titles.IndexOf(reqID) < 0) return WII_EINSTALL;
+    if (NandTitles.IndexOf(reqID) < 0) return WII_EINSTALL;
 
     char *stub = determineStubTIDLocation();
     if (!stub) return -68;
diff --git a/source/main.cpp b/source/main.cpp
index 793f95b9..e37672a5 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -58,7 +58,6 @@ extern bool geckoinit;
 extern char headlessID[8];
 char bootDevice[10];
 
-NandTitle titles;
 PartList partitions;
 
 int main(int argc, char *argv[])
@@ -70,7 +69,7 @@ int main(int argc, char *argv[])
     __exception_setreload(20);
 
     printf("\tStarting up\n");
-    titles.Get();
+    NandTitles.Get();
 
     bool bootDevice_found = false;
     if (argc >= 1)
@@ -109,8 +108,7 @@ int main(int argc, char *argv[])
     printf("done\n");
 
     // Let's load the cIOS now
-    IosLoader loader(titles);
-    if (loader.LoadAppCios() < 0)
+    if (IosLoader::LoadAppCios() < 0)
     {
         printf("\n\tWARNING!\n");
         printf("\tUSB Loader GX needs unstubbed cIOS 222 v4 or 249 v9+\n\n");
diff --git a/source/menu.cpp b/source/menu.cpp
index 8d89358d..6ea8c491 100644
--- a/source/menu.cpp
+++ b/source/menu.cpp
@@ -612,8 +612,8 @@ int MainMenu(int menu)
         u32 channel = 0;
         if (returnToLoaderGV)
         {
-            int idx = titles.FindU32(Settings.returnTo);
-            if (idx >= 0) channel = TITLE_LOWER( titles.At( idx ) );
+            int idx = NandTitles.FindU32(Settings.returnTo);
+            if (idx >= 0) channel = TITLE_LOWER( NandTitles.At( idx ) );
         }
 
         //This is temporary
diff --git a/source/prompts/TitleBrowser.cpp b/source/prompts/TitleBrowser.cpp
index 13a1bbda..0fb8ea28 100644
--- a/source/prompts/TitleBrowser.cpp
+++ b/source/prompts/TitleBrowser.cpp
@@ -59,19 +59,19 @@ bool TitleSelector(char output[])
     ISFS_Initialize();//initialize for "titles.Exists()"
 
     // Get count of titles of the good titles
-    num_titles = titles.SetType(0x10001);
+    num_titles = NandTitles.SetType(0x10001);
     u32 n = num_titles;
     //gprintf("num_titles: %u\n", num_titles );
     for (u32 i = 0; i < n; i++)
     {
-        u64 tid = titles.Next();
+        u64 tid = NandTitles.Next();
         if (!tid)
         {
             break;
         }
 
         //remove ones not actually installed on the nand
-        if (!titles.Exists(tid))
+        if (!NandTitles.Exists(tid))
         {
             num_titles--;
         }
@@ -89,29 +89,29 @@ bool TitleSelector(char output[])
     //write the titles on the option browser
 
     s32 i = 0;
-    titles.SetType(0x10001);
+    NandTitles.SetType(0x10001);
     while (i < num_titles)
     {
-        u64 tid = titles.Next();
+        u64 tid = NandTitles.Next();
         if (!tid)
         {
             gprintf("shit happened\n");
             break;
         }
 
-        if (!titles.Exists(tid))
+        if (!NandTitles.Exists(tid))
         {
             continue;
         }
 
         char id[5];
-        titles.AsciiTID(tid, (char*) &id);
+        NandTitles.AsciiTID(tid, (char*) &id);
 
-        const char* name = titles.NameOf(tid);
+        const char* name = NandTitles.NameOf(tid);
         //gprintf("%016llx: %s: %s\n%p\t%p\n", tid, id, name, &id, name );
 
         options4.SetName(i, "%s", id);
-        options4.SetValue(i, "%s", name ? titles.NameOf(tid) : tr( "Unknown" ));
+        options4.SetValue(i, "%s", name ? NandTitles.NameOf(tid) : tr( "Unknown" ));
         titleList[i] = tid;
         i++;
     }
@@ -238,29 +238,29 @@ int TitleBrowser()
     ISFS_Initialize();//initialize for "titles.Exists()"
 
     // Get count of titles of the good titles
-    num_titles = titles.SetType(0x10001);
+    num_titles = NandTitles.SetType(0x10001);
     u32 n = num_titles;
     for (u32 i = 0; i < n; i++)
     {
-        u64 tid = titles.Next();
+        u64 tid = NandTitles.Next();
         if (!tid)
         {
             break;
         }
 
         //remove ones not actually installed on the nand
-        if (!titles.Exists(tid))
+        if (!NandTitles.Exists(tid))
         {
             num_titles--;
         }
     }
 
     // Get count of system titles
-    num_sys_titles = titles.SetType(0x10002);
+    num_sys_titles = NandTitles.SetType(0x10002);
     n = num_sys_titles;
     for (u32 i = 0; i < n; i++)
     {
-        u64 tid = titles.Next();
+        u64 tid = NandTitles.Next();
         if (!tid)
         {
             break;
@@ -273,7 +273,7 @@ int TitleBrowser()
         }
 
         //these aren't installed on the nand
-        if (!titles.Exists(tid))
+        if (!NandTitles.Exists(tid))
         {
             num_sys_titles--;
         }
@@ -290,55 +290,55 @@ int TitleBrowser()
     //write the titles on the option browser
 
     u32 i = 0;
-    titles.SetType(0x10001);
+    NandTitles.SetType(0x10001);
     //first add the good stuff
     while (i < num_titles)
     {
-        u64 tid = titles.Next();
+        u64 tid = NandTitles.Next();
         if (!tid)
         {
             gprintf("shit happened3\n");
             break;
         }
-        gprintf("[ %u ] tid: %016llx\t%s\n", i, tid, titles.NameOf(tid));
+        gprintf("[ %u ] tid: %016llx\t%s\n", i, tid, NandTitles.NameOf(tid));
 
-        if (!titles.Exists(tid))
+        if (!NandTitles.Exists(tid))
         {
             continue;
         }
 
         char id[5];
-        titles.AsciiTID(tid, (char*) &id);
+        NandTitles.AsciiTID(tid, (char*) &id);
 
-        const char* name = titles.NameOf(tid);
+        const char* name = NandTitles.NameOf(tid);
 
         options3.SetName(i, "%s", id);
-        options3.SetValue(i, "%s", name ? titles.NameOf(tid) : tr( "Unknown" ));
+        options3.SetValue(i, "%s", name ? NandTitles.NameOf(tid) : tr( "Unknown" ));
         titleList[i] = tid;
         i++;
     }
 
-    titles.SetType(0x10002);
+    NandTitles.SetType(0x10002);
     while (i < num_sys_titles + num_titles)
     {
-        u64 tid = titles.Next();
+        u64 tid = NandTitles.Next();
         if (!tid)
         {
             break;
         }
         if (TITLE_LOWER( tid ) == 0x48414741 || TITLE_LOWER( tid ) == 0x48414141 || TITLE_LOWER( tid ) == 0x48414641) continue;
 
-        if (!titles.Exists(tid))
+        if (!NandTitles.Exists(tid))
         {
             continue;
         }
 
         char id[5];
-        titles.AsciiTID(tid, (char*) &id);
-        const char* name = titles.NameOf(tid);
+        NandTitles.AsciiTID(tid, (char*) &id);
+        const char* name = NandTitles.NameOf(tid);
 
         options3.SetName(i, "%s", id);
-        options3.SetValue(i, "%s", name ? titles.NameOf(tid) : tr( "Unknown" ));
+        options3.SetValue(i, "%s", name ? NandTitles.NameOf(tid) : tr( "Unknown" ));
         titleList[i] = tid;
         i++;
     }
@@ -470,9 +470,9 @@ int TitleBrowser()
                 //set the title's name, number, ID to text
                 char text[0x100];
                 char id[5];
-                titles.AsciiTID(titleList[ret], (char*) &id);
+                NandTitles.AsciiTID(titleList[ret], (char*) &id);
 
-                snprintf(text, sizeof(text), "%s : %s", id, titles.NameOf(titleList[ret]));
+                snprintf(text, sizeof(text), "%s : %s", id, NandTitles.NameOf(titleList[ret]));
 
                 //prompt to boot selected title
                 if (WindowPrompt(tr( "Boot?" ), text, tr( "OK" ), tr( "Cancel" )))
diff --git a/source/settings/Settings.cpp b/source/settings/Settings.cpp
index 21254eeb..252810e5 100644
--- a/source/settings/Settings.cpp
+++ b/source/settings/Settings.cpp
@@ -1045,8 +1045,8 @@ int MenuSettings()
                                             Settings.cios = 222;
                                             break;
                                     }
-                                    if ((Settings.cios == 222 && titles.VersionOf(0x1000000deULL) != 4)
-                                            || (Settings.cios == 2 && titles.VersionOf(0x1000000dfULL) != 4))
+                                    if ((Settings.cios == 222 && NandTitles.VersionOf(0x1000000deULL) != 4)
+                                            || (Settings.cios == 2 && NandTitles.VersionOf(0x1000000dfULL) != 4))
                                     {
                                         WindowPrompt(
                                                 tr( "Hermes CIOS" ),
@@ -1135,10 +1135,10 @@ int MenuSettings()
                                         snprintf(Settings.returnTo, sizeof(Settings.returnTo), "%s", tidChar);
                                     }
                                 }
-                                int haveTitle = titles.FindU32(Settings.returnTo);
+                                int haveTitle = NandTitles.FindU32(Settings.returnTo);
                                 if (haveTitle >= 0)
                                 {
-                                    name = (char*) titles.NameFromIndex(haveTitle);
+                                    name = (char*) NandTitles.NameFromIndex(haveTitle);
                                     if (!strlen(name)) name = NULL;
                                 }
                                 options2.SetValue(Idx, "%s", name ? name : tr( opts_off_on[ 0 ] ));
@@ -2719,12 +2719,12 @@ int GameSettings(struct discHdr * header)
                             if (ret == Idx && ++returnToLoaderGV >= settings_off_on_max) returnToLoaderGV = 0;
 
                             char text[IMET_MAX_NAME_LEN];
-                            int channel = titles.FindU32(Settings.returnTo);//is the channel set in the global settings actually installed?
+                            int channel = NandTitles.FindU32(Settings.returnTo);//is the channel set in the global settings actually installed?
 
                             if (!returnToLoaderGV || channel < 0)//channel is not installed or the uer wants to not use it
                                 sprintf(text, "%s", tr( opts_off_on[ 0 ] ));
 
-                            else snprintf(text, sizeof(text), "%s", titles.NameFromIndex(channel));
+                            else snprintf(text, sizeof(text), "%s", NandTitles.NameFromIndex(channel));
 
                             options2.SetValue(Idx, "%s", text);
                         }
diff --git a/source/system/IosLoader.cpp b/source/system/IosLoader.cpp
index dbfe97cc..a20d9969 100644
--- a/source/system/IosLoader.cpp
+++ b/source/system/IosLoader.cpp
@@ -1,115 +1,100 @@
-#include <gctypes.h>
-
-#include "IosLoader.h"
-#include "../fatmounter.h"
-#include "../usbloader/usbstorage2.h"
-#include "../wad/nandtitle.h"
-#include "../mload/mload_modules.h"
-#include "../settings/CSettings.h"
-
-/******************************************************************************
- * Construction/Destruction:
- ******************************************************************************/
-
-/* Initializes a new instance of the IosLoader class. */
-IosLoader::IosLoader(NandTitle titles)
-{
-    nandTitles = titles;
-}
-
-/* Finalizes an instance of the IosLoader class. */
-IosLoader::~IosLoader()
-{
-}
-
-/******************************************************************************
- * Public Methods:
- ******************************************************************************/
-
-/*
- * Loads CIOS (If possible the one from the settings file).
- * @return 0 if a cios has been successfully loaded. Else a value below 0 is returned.
- */
-s32 IosLoader::LoadAppCios()
-{
-    s32 ret = -1;
-
-    // Unmount devices before reloading IOS.
-    SDCard_deInit();
-    USBDevice_deInit();
-    USBStorage2_Deinit();
-
-    u32 ciosLoadPriority[] = { 250, 249, 222, Settings.cios }; // Descending.
-    u32 activeCios = IOS_GetVersion();
-
-
-    for (u8 i=(sizeof(ciosLoadPriority)/sizeof(ciosLoadPriority[0])); i>=0; i--)
-    {
-        u32 cios = ciosLoadPriority[i];
-
-        if (activeCios == cios)
-        {
-            ret = 0;
-            break;
-        }
-
-        if ((ret = ReloadIosSafe(cios)) > -1)
-        {
-            // Remember working cios.
-            Settings.cios = cios;
-            break;
-        }
-    }
-
-    // Remount devices after reloading IOS.
-    SDCard_Init();
-    if (IOS_GetVersion() == 222) load_ehc_module();
-    USBDevice_Init();
-
-    return ret;
-}
-
-/******************************************************************************
- * Private/Protected Methods:
- ******************************************************************************/
-
-/*
- * Reloads a certain IOS under the condition, that an appropriate version of the IOS is installed.
- * @return a negative value if a safe reload of the ios was not possible.
- */
-s32 IosLoader::ReloadIosSafe(s32 ios)
-{
-    switch (ios)
-    {
-        case 222:
-        {
-            s32 ios222rev = nandTitles.VersionOf(0x1000000deULL);
-            if (ios222rev == 4 || ios222rev == 5 || ios222rev == 65535) break;
-            return -2;
-        }
-        case 223:
-        {
-            s32 ios223rev = nandTitles.VersionOf(0x1000000dfULL);
-            if (ios223rev == 4 || ios223rev == 5 || ios223rev == 65535) break;
-            return -2;
-        }
-        case 249:
-        {
-            s32 ios249rev = nandTitles.VersionOf(0x1000000f9ULL);
-            if (ios249rev < 9 || ios249rev == 65280) return -2;
-            break;
-        }
-        case 250:
-        {
-            s32 ios250rev = nandTitles.VersionOf(0x1000000faULL);
-            if (ios250rev < 9 || ios250rev == 65280) return -2;
-            break;
-        }
-        default:
-            return -3;
-    }
-
-    s32 r = IOS_ReloadIOS(ios);
-    if (r >= 0) WII_Initialize();
-    return r;
-}
+#include <gctypes.h>
+
+#include "IosLoader.h"
+#include "../fatmounter.h"
+#include "../usbloader/usbstorage2.h"
+#include "../wad/nandtitle.h"
+#include "../mload/mload_modules.h"
+#include "../settings/CSettings.h"
+#include "wad/nandtitle.h"
+
+/******************************************************************************
+ * Public Methods:
+ ******************************************************************************/
+/*
+ * Loads CIOS (If possible the one from the settings file).
+ * @return 0 if a cios has been successfully loaded. Else a value below 0 is returned.
+ */
+s32 IosLoader::LoadAppCios()
+{
+    s32 ret = -1;
+
+    // Unmount devices before reloading IOS.
+    SDCard_deInit();
+    USBDevice_deInit();
+    USBStorage2_Deinit();
+
+    u32 ciosLoadPriority[] = { 250, 249, 222, Settings.cios }; // Descending.
+    u32 activeCios = IOS_GetVersion();
+
+
+    for (u8 i=(sizeof(ciosLoadPriority)/sizeof(ciosLoadPriority[0])); i>=0; i--)
+    {
+        u32 cios = ciosLoadPriority[i];
+
+        if (activeCios == cios)
+        {
+            ret = 0;
+            break;
+        }
+
+        if ((ret = ReloadIosSafe(cios)) > -1)
+        {
+            // Remember working cios.
+            Settings.cios = cios;
+            break;
+        }
+    }
+
+    // Remount devices after reloading IOS.
+    SDCard_Init();
+    if (IOS_GetVersion() == 222) load_ehc_module();
+    USBDevice_Init();
+
+    return ret;
+}
+
+/******************************************************************************
+ * Private/Protected Methods:
+ ******************************************************************************/
+
+/*
+ * Reloads a certain IOS under the condition, that an appropriate version of the IOS is installed.
+ * @return a negative value if a safe reload of the ios was not possible.
+ */
+s32 IosLoader::ReloadIosSafe(s32 ios)
+{
+    switch (ios)
+    {
+        case 222:
+        {
+            s32 ios222rev = NandTitles.VersionOf(0x1000000deULL);
+            if (ios222rev == 4 || ios222rev == 5 || ios222rev == 65535) break;
+            return -2;
+        }
+        case 223:
+        {
+            s32 ios223rev = NandTitles.VersionOf(0x1000000dfULL);
+            if (ios223rev == 4 || ios223rev == 5 || ios223rev == 65535) break;
+            return -2;
+        }
+        case 249:
+        {
+            s32 ios249rev = NandTitles.VersionOf(0x1000000f9ULL);
+            if (ios249rev < 9 || ios249rev == 65280) return -2;
+            break;
+        }
+        case 250:
+        {
+            s32 ios250rev = NandTitles.VersionOf(0x1000000faULL);
+            if (ios250rev < 9 || ios250rev == 65280) return -2;
+            break;
+        }
+        default:
+            return -3;
+    }
+
+    s32 r = IOS_ReloadIOS(ios);
+    if (r >= 0) WII_Initialize();
+    return r;
+}
diff --git a/source/system/IosLoader.h b/source/system/IosLoader.h
index 5a59f8db..da9b47f5 100644
--- a/source/system/IosLoader.h
+++ b/source/system/IosLoader.h
@@ -1,19 +1,13 @@
-#ifndef _IOSLOADER_H_
-#define _IOSLOADER_H_
-
-#include <gctypes.h>
-#include "../wad/nandtitle.h"
-
-class IosLoader
-{
-    public:
-        IosLoader(NandTitle titles);
-        ~IosLoader();
-        s32 CheckForCios();
-        s32 LoadAppCios();
-    private:
-        NandTitle nandTitles;
-        s32 ReloadIosSafe(s32 ios);
-};
-
-#endif
+#ifndef _IOSLOADER_H_
+#define _IOSLOADER_H_
+
+#include <gctypes.h>
+
+class IosLoader
+{
+    public:
+        static s32 LoadAppCios();
+        static s32 ReloadIosSafe(s32 ios);
+};
+
+#endif
diff --git a/source/wad/nandtitle.cpp b/source/wad/nandtitle.cpp
index b4587757..9963fbfd 100644
--- a/source/wad/nandtitle.cpp
+++ b/source/wad/nandtitle.cpp
@@ -1,6 +1,8 @@
 #include "nandtitle.h"
 #include "gecko.h"
 
+NandTitle NandTitles;
+
 extern "C"
 {
     extern s32 MagicPatches(s32);
diff --git a/source/wad/nandtitle.h b/source/wad/nandtitle.h
index be270115..27584314 100644
--- a/source/wad/nandtitle.h
+++ b/source/wad/nandtitle.h
@@ -108,5 +108,6 @@ class NandTitle
         u32 currentType;
 };
 
-extern NandTitle titles;
+extern NandTitle NandTitles;
+
 #endif // NANDTITLE_H
diff --git a/source/wad/wad.cpp b/source/wad/wad.cpp
index 9b1fb95c..9760ad13 100644
--- a/source/wad/wad.cpp
+++ b/source/wad/wad.cpp
@@ -560,7 +560,7 @@ s32 Wad_Uninstall(FILE *fp)
     msg2Txt.SetText(tr( ">> Deleting tickets..." ));
 
     // Get ticket views
-    ret = titles.GetTicketViews(tid, &viewData, &viewCnt);
+    ret = NandTitles.GetTicketViews(tid, &viewData, &viewCnt);
     if (ret < 0)
     {
         char errTxt[50];