diff --git a/build/tests/DisplaySystemInformation/ARM9/Makefile b/build/tests/DisplaySystemInformation/ARM9/Makefile
index 39319573..901b15b9 100644
--- a/build/tests/DisplaySystemInformation/ARM9/Makefile
+++ b/build/tests/DisplaySystemInformation/ARM9/Makefile
@@ -31,10 +31,9 @@ include $(TWL_IPL_RED_ROOT)/build/tests/RelocateChecker/buildtools/commondefs
 #----------------------------------------------------------------------------
 
 rb:
-	ruby makeMakingTest.rb
+	ruby makeMaking.rb
 
 do-build :
-	
 	$(TARGETS)
 
 
diff --git a/build/tests/DisplaySystemInformation/ARM9/makeMaking.rb b/build/tests/DisplaySystemInformation/ARM9/makeMaking.rb
index 66a5a4bd..06b04a2a 100755
--- a/build/tests/DisplaySystemInformation/ARM9/makeMaking.rb
+++ b/build/tests/DisplaySystemInformation/ARM9/makeMaking.rb
@@ -34,11 +34,9 @@ while l = fCond.gets
 		strVal = "DONTCARE" if value == "D"
 
 		if argList[argIdx] == "GAMECODE" || argList[argIdx] == "FILE_IDX"
-			argSet = argList[argIdx] + "\t=\t"
-			argSet += value
+			argSet = "#{argList[argIdx]}\t=\t#{value}"
 		else
-			argSet = argList[argIdx].to_s + "\t=\t"
-			argSet += strVal
+			argSet = "#{argList[argIdx]}\t=\t#{strVal}"
 		end
 
 		f.puts argSet
@@ -51,4 +49,6 @@ while l = fCond.gets
 	fileIdx += 1
 end
 
-fCond.close
\ No newline at end of file
+fCond.close
+
+(0...fileIdx).each{ |i| print "Makefile.#{i} "}
\ No newline at end of file
diff --git a/build/tests/DisplaySystemInformation/ARM9/src/drawFunc.c b/build/tests/DisplaySystemInformation/ARM9/src/drawFunc.c
index a4468c62..84d77cb9 100644
--- a/build/tests/DisplaySystemInformation/ARM9/src/drawFunc.c
+++ b/build/tests/DisplaySystemInformation/ARM9/src/drawFunc.c
@@ -236,7 +236,7 @@ void printValue( int menu,int entryLine, int drawOffset, DispInfoEntry *entry )
 		return;
 	}
 	
-	if( menu == MENU_SECURE_USER && entryLine == SECURE_USER_LAUNCHER_ID )
+	if( menu == MENU_SECURE_HW && entryLine == SECURE_HW_LAUNCHER_ID )
 	{
 		char buf[5];
 		
diff --git a/build/tests/DisplaySystemInformation/ARM9/src/get_hw.c b/build/tests/DisplaySystemInformation/ARM9/src/get_hw.c
index 7ad21939..25c8896a 100644
--- a/build/tests/DisplaySystemInformation/ARM9/src/get_hw.c
+++ b/build/tests/DisplaySystemInformation/ARM9/src/get_hw.c
@@ -82,6 +82,25 @@ void getSecureHWInfo( void )
 
 	}
 	
+	// ランチャのタイトルIDLoの取得
+	if( LCFG_ReadHWSecureInfo() )
+	{
+		const u8 *titleIDLo = LCFG_THW_GetLauncherTitleID_LoPtr();
+		value = ( int )(	titleIDLo[0] << 8*3 |
+							titleIDLo[1] << 8*2 |
+							titleIDLo[2] << 8*1 |
+							titleIDLo[3] << 8*0 );
 
+		gAllInfo[MENU_SECURE_HW][SECURE_HW_LAUNCHER_ID].iValue = value;
+		gAllInfo[MENU_SECURE_HW][SECURE_HW_LAUNCHER_ID].isNumData = TRUE;
+	}
+	else
+	{
+		gAllInfo[MENU_SECURE_HW][SECURE_HW_LAUNCHER_ID].str.sjis = s_strNA;
+	}
+	
+	gAllInfo[MENU_SECURE_HW][SECURE_HW_LAUNCHER_ID].isAligned = FALSE;
+	gAllInfo[MENU_SECURE_HW][SECURE_HW_LAUNCHER_ID].numLines = 2;
+	gAllInfo[MENU_SECURE_HW][SECURE_HW_LAUNCHER_ID].fromLCFG = TRUE;
 
 }
diff --git a/build/tests/DisplaySystemInformation/ARM9/src/get_secureUser.c b/build/tests/DisplaySystemInformation/ARM9/src/get_secureUser.c
index 9182b7bc..f42a1ee0 100644
--- a/build/tests/DisplaySystemInformation/ARM9/src/get_secureUser.c
+++ b/build/tests/DisplaySystemInformation/ARM9/src/get_secureUser.c
@@ -108,24 +108,5 @@ void getSecureUserInfo( void )
 		}
 	}
 	
-	// ランチャのタイトルIDLoの取得
-	if( LCFG_ReadHWSecureInfo() )
-	{
-		const u8 *titleIDLo = LCFG_THW_GetLauncherTitleID_LoPtr();
-		value = ( int )(	titleIDLo[0] << 8*3 |
-							titleIDLo[1] << 8*2 |
-							titleIDLo[2] << 8*1 |
-							titleIDLo[3] << 8*0 );
 
-		gAllInfo[MENU_SECURE_USER][SECURE_USER_LAUNCHER_ID].iValue = value;
-		gAllInfo[MENU_SECURE_USER][SECURE_USER_LAUNCHER_ID].isNumData = TRUE;
-	}
-	else
-	{
-		gAllInfo[MENU_SECURE_USER][SECURE_USER_LAUNCHER_ID].str.sjis = s_strNA;
-	}
-	
-	gAllInfo[MENU_SECURE_USER][SECURE_USER_LAUNCHER_ID].isAligned = FALSE;
-	gAllInfo[MENU_SECURE_USER][SECURE_USER_LAUNCHER_ID].numLines = 2;
-	gAllInfo[MENU_SECURE_USER][SECURE_USER_LAUNCHER_ID].fromLCFG = TRUE;
 }
\ No newline at end of file
diff --git a/build/tests/DisplaySystemInformation/ARM9/src/strResource.c b/build/tests/DisplaySystemInformation/ARM9/src/strResource.c
index 7e9f5cd7..30ace656 100644
--- a/build/tests/DisplaySystemInformation/ARM9/src/strResource.c
+++ b/build/tests/DisplaySystemInformation/ARM9/src/strResource.c
@@ -106,13 +106,12 @@ const char *s_strParentalMenu[] = {
 const char *s_strSecureUserMenu[] = {
 	"Finished Initial Setting(Setting)",
 	"Finished Initial Setting(Launcher)",
-	"Broken Setting Flag",
+	"Finished Broken Setting Sequence",
 	"Installed Softbox Count",
 	"Free Softbox Count",
 	"Last Boot Soft Index",
 	"Last Boot Soft Platform",
-	"Last Boot Soft ID",
-	"Launcher TitleID Lo"
+	"Last Boot Soft ID"
 };
 
 const char *s_strOtherMenu[] = {
@@ -131,7 +130,8 @@ const char *s_strSecureHWMenu[] = {
 	"Region",
 	"Serial No",
 	"Language Bitmap",
-	"Fuse Data"
+	"Fuse Data",
+	"Launcher TitleID Lo"
 };
 
 const char *s_strSCFGArm9Menu[] = {
diff --git a/build/tests/DisplaySystemInformation/ARM9/src/strResource.h b/build/tests/DisplaySystemInformation/ARM9/src/strResource.h
index 91d8d540..55d57b3f 100644
--- a/build/tests/DisplaySystemInformation/ARM9/src/strResource.h
+++ b/build/tests/DisplaySystemInformation/ARM9/src/strResource.h
@@ -66,7 +66,6 @@
 #define SECURE_USER_LASTBOOT_IDX		5
 #define SECURE_USER_LASTBOOT_PLATFORM	6
 #define SECURE_USER_LASTBOOT_ID			7
-#define SECURE_USER_LAUNCHER_ID			8
 
 #define OTHER_AGREE_EULA				0
 #define OTHER_EULA_VERSION				1
@@ -80,6 +79,7 @@
 #define SECURE_HW_SERIAL		2
 #define SECURE_HW_LANGUAGE		3
 #define SECURE_HW_FUSE			4
+#define SECURE_HW_LAUNCHER_ID	5
 
 #define SCFG_ARM9_ROM_SEC			0
 #define SCFG_ARM9_ROM_STATE			1
@@ -186,10 +186,10 @@
 #define ROOTMENU_SIZE 			15
 #define OWNERMENU_SIZE 			6
 #define PARENTALMENU_SIZE 		12
-#define SECURE_USER_MENU_SIZE	9
+#define SECURE_USER_MENU_SIZE	8
 #define OTHERMENU_SIZE			3
 #define NORMAL_HW_MENU_SIZE 	2
-#define SECURE_HW_MENU_SIZE 	5
+#define SECURE_HW_MENU_SIZE 	6
 #define SCFG_ARM7_MENU_SIZE 	47
 #define SCFG_ARM9_MENU_SIZE 	24
 #define SYSMENU_MENU_SIZE		10
diff --git a/build/tests/DisplaySystemInformation/ARM9/src/viewSystemInfo.c b/build/tests/DisplaySystemInformation/ARM9/src/viewSystemInfo.c
index d0fcb62a..32021292 100644
--- a/build/tests/DisplaySystemInformation/ARM9/src/viewSystemInfo.c
+++ b/build/tests/DisplaySystemInformation/ARM9/src/viewSystemInfo.c
@@ -120,7 +120,7 @@ void initInfo( void )
 	// sjis (char)
 	infoAlloc( gAllInfo[MENU_OWNER], OWNER_BIRTHDAY, DISPINFO_BUFSIZE , TRUE );
 	infoAlloc( gAllInfo[MENU_SECURE_USER], SECURE_USER_LASTBOOT_ID, DISPINFO_BUFSIZE , TRUE );
-	infoAlloc( gAllInfo[MENU_SECURE_USER], SECURE_USER_LAUNCHER_ID, DISPINFO_BUFSIZE, TRUE );
+	infoAlloc( gAllInfo[MENU_SECURE_HW], SECURE_HW_LAUNCHER_ID, DISPINFO_BUFSIZE, TRUE );
 	infoAlloc( gAllInfo[MENU_NORMAL_HW], NORMAL_HW_UNIQUE_ID, OS_TWL_HWINFO_MOVABLE_UNIQUE_ID_LEN*3 , TRUE );
 	infoAlloc( gAllInfo[MENU_SECURE_HW], SECURE_HW_SERIAL , OS_TWL_HWINFO_SERIALNO_LEN_MAX + 1, TRUE );
 	infoAlloc( gAllInfo[MENU_SECURE_HW], SECURE_HW_LANGUAGE, DISPINFO_BUFSIZE , TRUE );
diff --git a/build/tests/DisplaySystemInformation/banner/Makefile b/build/tests/DisplaySystemInformation/banner/Makefile
index c59692a1..bfd869e7 100644
--- a/build/tests/DisplaySystemInformation/banner/Makefile
+++ b/build/tests/DisplaySystemInformation/banner/Makefile
@@ -16,21 +16,24 @@
 # $Author$
 #----------------------------------------------------------------------------
 
-SUBDIRS					=	
-SUBMAKES		=	Makefile.020A Makefile.021A Makefile.022A Makefile.023A \
-					Makefile.024A Makefile.025A Makefile.0B0A Makefile.0B1A \
-					Makefile.0B2A Makefile.0B3A Makefile.0B4A Makefile.0B5A \
-					Makefile.0B6A Makefile.0B7A Makefile.0B8A Makefile.0B9A \
-					Makefile.0BAA Makefile.0BBA
-include $(TWL_IPL_RED_ROOT)/build/tests/RelocateChecker/buildtools/commondefs
+SUBDIRS			=	
+SUBMAKES		=	\
+	Makefile.0B0A	Makefile.0B1A	Makefile.0B2A	Makefile.0B3A	\
+	Makefile.020A	Makefile.021A	Makefile.0B4A	Makefile.0B5A	\
+	Makefile.0B6A	Makefile.0B7A	Makefile.0B8A	Makefile.0B9A	\
+	Makefile.0BAA	Makefile.0BBA	Makefile.022A	Makefile.023A	\
+	Makefile.024A	Makefile.025A	
+
+
+include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
 
 #----------------------------------------------------------------------------
 
 do-build : $(TARGETS)
 
-include $(TWL_IPL_RED_ROOT)/build/tests/RelocateChecker/buildtools/modulerules
+
+include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
 
 #----------------------------------------------------------------------------
 
 #===== End of Makefile =====
-
diff --git a/build/tests/DisplaySystemInformation/banner/Makefile.020A b/build/tests/DisplaySystemInformation/banner/Makefile.020A
index e3c9d670..69b02397 100644
--- a/build/tests/DisplaySystemInformation/banner/Makefile.020A
+++ b/build/tests/DisplaySystemInformation/banner/Makefile.020A
@@ -1,48 +1,48 @@
-#! make -f
-#----------------------------------------------------------------------------
-# Project:  TwlIPL
-# File:     Makefile
-#
-# Copyright 2007 Nintendo.  All rights reserved.
-#
-# These coded instructions, statements, and computer programs contain
-# proprietary information of Nintendo of America Inc. and/or Nintendo
-# Company Ltd., and are protected by Federal copyright law.  They may
-# not be disclosed to third parties or copied or duplicated in any form,
-# in whole or in part, without the prior written consent of Nintendo.
-#
-# $Date::            $
-# $Rev$
-# $Author$
-#----------------------------------------------------------------------------
-
+#! make -f
+#----------------------------------------------------------------------------
+# Project:  TwlIPL
+# File:     Makefile
+#
+# Copyright 2007 Nintendo.  All rights reserved.
+#
+# These coded instructions, statements, and computer programs contain
+# proprietary information of Nintendo of America Inc. and/or Nintendo
+# Company Ltd., and are protected by Federal copyright law.  They may
+# not be disclosed to third parties or copied or duplicated in any form,
+# in whole or in part, without the prior written consent of Nintendo.
+#
+# $Date::            $
+# $Rev$
+# $Author$
+#----------------------------------------------------------------------------
+
 GAMECODE	=	020A
-include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
-
-ICON_DIR			= ./icon
-
-BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
-BANNER_SPEC			= banner_v3.bsf
-
-TARGETS				= $(GAMECODE).bnr
-INSTALL_DIR			= ./
-INSTALL_TARGETS		= $(TARGETS)
-
-BANNER_ICON_NAME	= $(basename $(BANNER_ICON))
-
-LDIRT_CLEAN			= $(TARGETS) \
-					  $(BANNER_ICON_NAME).nbfs \
-					  $(BANNER_ICON_NAME).nbfc \
-					  $(BANNER_ICON_NAME).nbfp \
-					  $(TARGETS:.bnr=.srl)
-
-include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
-
-#----------------------------------------------------------------------------
-#  build
-#----------------------------------------------------------------------------
-do-build:		$(TARGETS)
-
-$(TARGETS):		$(BANNER_SPEC) $(BANNER_ICON)
-				$(NTEXCONV) -no -bg -bgb -bgnc $(BANNER_ICON) >/dev/null && \
-				$(MAKEBANNER) -N $(BANNER_ICON_NAME) $(BANNER_SPEC) $(TARGETS)
+include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
+
+ICON_DIR			= ./icon
+
+BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
+BANNER_SPEC			= banner$(GAMECODE)_v3.bsf
+
+TARGETS				= $(GAMECODE).bnr
+INSTALL_DIR			= ./
+INSTALL_TARGETS		= $(TARGETS)
+
+BANNER_ICON_NAME	= $(basename $(BANNER_ICON))
+
+LDIRT_CLEAN			= $(TARGETS) \
+					  $(BANNER_ICON_NAME).nbfs \
+					  $(BANNER_ICON_NAME).nbfc \
+					  $(BANNER_ICON_NAME).nbfp \
+					  $(TARGETS:.bnr=.srl)
+
+include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
+
+#----------------------------------------------------------------------------
+#  build
+#----------------------------------------------------------------------------
+do-build:		$(TARGETS)
+
+$(TARGETS):		$(BANNER_SPEC) $(BANNER_ICON)
+				$(NTEXCONV) -no -bg -bgb -bgnc $(BANNER_ICON) >/dev/null && \
+				$(MAKEBANNER) -N $(BANNER_ICON_NAME) $(BANNER_SPEC) $(TARGETS)
diff --git a/build/tests/DisplaySystemInformation/banner/Makefile.021A b/build/tests/DisplaySystemInformation/banner/Makefile.021A
index bfc6f5b2..bbc7f3ba 100644
--- a/build/tests/DisplaySystemInformation/banner/Makefile.021A
+++ b/build/tests/DisplaySystemInformation/banner/Makefile.021A
@@ -1,48 +1,48 @@
-#! make -f
-#----------------------------------------------------------------------------
-# Project:  TwlIPL
-# File:     Makefile
-#
-# Copyright 2007 Nintendo.  All rights reserved.
-#
-# These coded instructions, statements, and computer programs contain
-# proprietary information of Nintendo of America Inc. and/or Nintendo
-# Company Ltd., and are protected by Federal copyright law.  They may
-# not be disclosed to third parties or copied or duplicated in any form,
-# in whole or in part, without the prior written consent of Nintendo.
-#
-# $Date::            $
-# $Rev$
-# $Author$
-#----------------------------------------------------------------------------
-
+#! make -f
+#----------------------------------------------------------------------------
+# Project:  TwlIPL
+# File:     Makefile
+#
+# Copyright 2007 Nintendo.  All rights reserved.
+#
+# These coded instructions, statements, and computer programs contain
+# proprietary information of Nintendo of America Inc. and/or Nintendo
+# Company Ltd., and are protected by Federal copyright law.  They may
+# not be disclosed to third parties or copied or duplicated in any form,
+# in whole or in part, without the prior written consent of Nintendo.
+#
+# $Date::            $
+# $Rev$
+# $Author$
+#----------------------------------------------------------------------------
+
 GAMECODE	=	021A
-include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
-
-ICON_DIR			= ./icon
-
-BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
-BANNER_SPEC			= banner_v3.bsf
-
-TARGETS				= $(GAMECODE).bnr
-INSTALL_DIR			= ./
-INSTALL_TARGETS		= $(TARGETS)
-
-BANNER_ICON_NAME	= $(basename $(BANNER_ICON))
-
-LDIRT_CLEAN			= $(TARGETS) \
-					  $(BANNER_ICON_NAME).nbfs \
-					  $(BANNER_ICON_NAME).nbfc \
-					  $(BANNER_ICON_NAME).nbfp \
-					  $(TARGETS:.bnr=.srl)
-
-include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
-
-#----------------------------------------------------------------------------
-#  build
-#----------------------------------------------------------------------------
-do-build:		$(TARGETS)
-
-$(TARGETS):		$(BANNER_SPEC) $(BANNER_ICON)
-				$(NTEXCONV) -no -bg -bgb -bgnc $(BANNER_ICON) >/dev/null && \
-				$(MAKEBANNER) -N $(BANNER_ICON_NAME) $(BANNER_SPEC) $(TARGETS)
+include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
+
+ICON_DIR			= ./icon
+
+BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
+BANNER_SPEC			= banner$(GAMECODE)_v3.bsf
+
+TARGETS				= $(GAMECODE).bnr
+INSTALL_DIR			= ./
+INSTALL_TARGETS		= $(TARGETS)
+
+BANNER_ICON_NAME	= $(basename $(BANNER_ICON))
+
+LDIRT_CLEAN			= $(TARGETS) \
+					  $(BANNER_ICON_NAME).nbfs \
+					  $(BANNER_ICON_NAME).nbfc \
+					  $(BANNER_ICON_NAME).nbfp \
+					  $(TARGETS:.bnr=.srl)
+
+include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
+
+#----------------------------------------------------------------------------
+#  build
+#----------------------------------------------------------------------------
+do-build:		$(TARGETS)
+
+$(TARGETS):		$(BANNER_SPEC) $(BANNER_ICON)
+				$(NTEXCONV) -no -bg -bgb -bgnc $(BANNER_ICON) >/dev/null && \
+				$(MAKEBANNER) -N $(BANNER_ICON_NAME) $(BANNER_SPEC) $(TARGETS)
diff --git a/build/tests/DisplaySystemInformation/banner/Makefile.022A b/build/tests/DisplaySystemInformation/banner/Makefile.022A
index 2c83edf4..9222801e 100644
--- a/build/tests/DisplaySystemInformation/banner/Makefile.022A
+++ b/build/tests/DisplaySystemInformation/banner/Makefile.022A
@@ -1,48 +1,48 @@
-#! make -f
-#----------------------------------------------------------------------------
-# Project:  TwlIPL
-# File:     Makefile
-#
-# Copyright 2007 Nintendo.  All rights reserved.
-#
-# These coded instructions, statements, and computer programs contain
-# proprietary information of Nintendo of America Inc. and/or Nintendo
-# Company Ltd., and are protected by Federal copyright law.  They may
-# not be disclosed to third parties or copied or duplicated in any form,
-# in whole or in part, without the prior written consent of Nintendo.
-#
-# $Date::            $
-# $Rev$
-# $Author$
-#----------------------------------------------------------------------------
-
+#! make -f
+#----------------------------------------------------------------------------
+# Project:  TwlIPL
+# File:     Makefile
+#
+# Copyright 2007 Nintendo.  All rights reserved.
+#
+# These coded instructions, statements, and computer programs contain
+# proprietary information of Nintendo of America Inc. and/or Nintendo
+# Company Ltd., and are protected by Federal copyright law.  They may
+# not be disclosed to third parties or copied or duplicated in any form,
+# in whole or in part, without the prior written consent of Nintendo.
+#
+# $Date::            $
+# $Rev$
+# $Author$
+#----------------------------------------------------------------------------
+
 GAMECODE	=	022A
-include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
-
-ICON_DIR			= ./icon
-
-BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
-BANNER_SPEC			= banner_v3.bsf
-
-TARGETS				= $(GAMECODE).bnr
-INSTALL_DIR			= ./
-INSTALL_TARGETS		= $(TARGETS)
-
-BANNER_ICON_NAME	= $(basename $(BANNER_ICON))
-
-LDIRT_CLEAN			= $(TARGETS) \
-					  $(BANNER_ICON_NAME).nbfs \
-					  $(BANNER_ICON_NAME).nbfc \
-					  $(BANNER_ICON_NAME).nbfp \
-					  $(TARGETS:.bnr=.srl)
-
-include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
-
-#----------------------------------------------------------------------------
-#  build
-#----------------------------------------------------------------------------
-do-build:		$(TARGETS)
-
-$(TARGETS):		$(BANNER_SPEC) $(BANNER_ICON)
-				$(NTEXCONV) -no -bg -bgb -bgnc $(BANNER_ICON) >/dev/null && \
-				$(MAKEBANNER) -N $(BANNER_ICON_NAME) $(BANNER_SPEC) $(TARGETS)
+include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
+
+ICON_DIR			= ./icon
+
+BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
+BANNER_SPEC			= banner$(GAMECODE)_v3.bsf
+
+TARGETS				= $(GAMECODE).bnr
+INSTALL_DIR			= ./
+INSTALL_TARGETS		= $(TARGETS)
+
+BANNER_ICON_NAME	= $(basename $(BANNER_ICON))
+
+LDIRT_CLEAN			= $(TARGETS) \
+					  $(BANNER_ICON_NAME).nbfs \
+					  $(BANNER_ICON_NAME).nbfc \
+					  $(BANNER_ICON_NAME).nbfp \
+					  $(TARGETS:.bnr=.srl)
+
+include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
+
+#----------------------------------------------------------------------------
+#  build
+#----------------------------------------------------------------------------
+do-build:		$(TARGETS)
+
+$(TARGETS):		$(BANNER_SPEC) $(BANNER_ICON)
+				$(NTEXCONV) -no -bg -bgb -bgnc $(BANNER_ICON) >/dev/null && \
+				$(MAKEBANNER) -N $(BANNER_ICON_NAME) $(BANNER_SPEC) $(TARGETS)
diff --git a/build/tests/DisplaySystemInformation/banner/Makefile.023A b/build/tests/DisplaySystemInformation/banner/Makefile.023A
index b0f2c6ad..adbe8786 100644
--- a/build/tests/DisplaySystemInformation/banner/Makefile.023A
+++ b/build/tests/DisplaySystemInformation/banner/Makefile.023A
@@ -1,48 +1,48 @@
-#! make -f
-#----------------------------------------------------------------------------
-# Project:  TwlIPL
-# File:     Makefile
-#
-# Copyright 2007 Nintendo.  All rights reserved.
-#
-# These coded instructions, statements, and computer programs contain
-# proprietary information of Nintendo of America Inc. and/or Nintendo
-# Company Ltd., and are protected by Federal copyright law.  They may
-# not be disclosed to third parties or copied or duplicated in any form,
-# in whole or in part, without the prior written consent of Nintendo.
-#
-# $Date::            $
-# $Rev$
-# $Author$
-#----------------------------------------------------------------------------
-
+#! make -f
+#----------------------------------------------------------------------------
+# Project:  TwlIPL
+# File:     Makefile
+#
+# Copyright 2007 Nintendo.  All rights reserved.
+#
+# These coded instructions, statements, and computer programs contain
+# proprietary information of Nintendo of America Inc. and/or Nintendo
+# Company Ltd., and are protected by Federal copyright law.  They may
+# not be disclosed to third parties or copied or duplicated in any form,
+# in whole or in part, without the prior written consent of Nintendo.
+#
+# $Date::            $
+# $Rev$
+# $Author$
+#----------------------------------------------------------------------------
+
 GAMECODE	=	023A
-include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
-
-ICON_DIR			= ./icon
-
-BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
-BANNER_SPEC			= banner_v3.bsf
-
-TARGETS				= $(GAMECODE).bnr
-INSTALL_DIR			= ./
-INSTALL_TARGETS		= $(TARGETS)
-
-BANNER_ICON_NAME	= $(basename $(BANNER_ICON))
-
-LDIRT_CLEAN			= $(TARGETS) \
-					  $(BANNER_ICON_NAME).nbfs \
-					  $(BANNER_ICON_NAME).nbfc \
-					  $(BANNER_ICON_NAME).nbfp \
-					  $(TARGETS:.bnr=.srl)
-
-include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
-
-#----------------------------------------------------------------------------
-#  build
-#----------------------------------------------------------------------------
-do-build:		$(TARGETS)
-
-$(TARGETS):		$(BANNER_SPEC) $(BANNER_ICON)
-				$(NTEXCONV) -no -bg -bgb -bgnc $(BANNER_ICON) >/dev/null && \
-				$(MAKEBANNER) -N $(BANNER_ICON_NAME) $(BANNER_SPEC) $(TARGETS)
+include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
+
+ICON_DIR			= ./icon
+
+BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
+BANNER_SPEC			= banner$(GAMECODE)_v3.bsf
+
+TARGETS				= $(GAMECODE).bnr
+INSTALL_DIR			= ./
+INSTALL_TARGETS		= $(TARGETS)
+
+BANNER_ICON_NAME	= $(basename $(BANNER_ICON))
+
+LDIRT_CLEAN			= $(TARGETS) \
+					  $(BANNER_ICON_NAME).nbfs \
+					  $(BANNER_ICON_NAME).nbfc \
+					  $(BANNER_ICON_NAME).nbfp \
+					  $(TARGETS:.bnr=.srl)
+
+include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
+
+#----------------------------------------------------------------------------
+#  build
+#----------------------------------------------------------------------------
+do-build:		$(TARGETS)
+
+$(TARGETS):		$(BANNER_SPEC) $(BANNER_ICON)
+				$(NTEXCONV) -no -bg -bgb -bgnc $(BANNER_ICON) >/dev/null && \
+				$(MAKEBANNER) -N $(BANNER_ICON_NAME) $(BANNER_SPEC) $(TARGETS)
diff --git a/build/tests/DisplaySystemInformation/banner/Makefile.024A b/build/tests/DisplaySystemInformation/banner/Makefile.024A
index febf5b62..80b12300 100644
--- a/build/tests/DisplaySystemInformation/banner/Makefile.024A
+++ b/build/tests/DisplaySystemInformation/banner/Makefile.024A
@@ -1,48 +1,48 @@
-#! make -f
-#----------------------------------------------------------------------------
-# Project:  TwlIPL
-# File:     Makefile
-#
-# Copyright 2007 Nintendo.  All rights reserved.
-#
-# These coded instructions, statements, and computer programs contain
-# proprietary information of Nintendo of America Inc. and/or Nintendo
-# Company Ltd., and are protected by Federal copyright law.  They may
-# not be disclosed to third parties or copied or duplicated in any form,
-# in whole or in part, without the prior written consent of Nintendo.
-#
-# $Date::            $
-# $Rev$
-# $Author$
-#----------------------------------------------------------------------------
-
+#! make -f
+#----------------------------------------------------------------------------
+# Project:  TwlIPL
+# File:     Makefile
+#
+# Copyright 2007 Nintendo.  All rights reserved.
+#
+# These coded instructions, statements, and computer programs contain
+# proprietary information of Nintendo of America Inc. and/or Nintendo
+# Company Ltd., and are protected by Federal copyright law.  They may
+# not be disclosed to third parties or copied or duplicated in any form,
+# in whole or in part, without the prior written consent of Nintendo.
+#
+# $Date::            $
+# $Rev$
+# $Author$
+#----------------------------------------------------------------------------
+
 GAMECODE	=	024A
-include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
-
-ICON_DIR			= ./icon
-
-BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
-BANNER_SPEC			= banner_v3.bsf
-
-TARGETS				= $(GAMECODE).bnr
-INSTALL_DIR			= ./
-INSTALL_TARGETS		= $(TARGETS)
-
-BANNER_ICON_NAME	= $(basename $(BANNER_ICON))
-
-LDIRT_CLEAN			= $(TARGETS) \
-					  $(BANNER_ICON_NAME).nbfs \
-					  $(BANNER_ICON_NAME).nbfc \
-					  $(BANNER_ICON_NAME).nbfp \
-					  $(TARGETS:.bnr=.srl)
-
-include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
-
-#----------------------------------------------------------------------------
-#  build
-#----------------------------------------------------------------------------
-do-build:		$(TARGETS)
-
-$(TARGETS):		$(BANNER_SPEC) $(BANNER_ICON)
-				$(NTEXCONV) -no -bg -bgb -bgnc $(BANNER_ICON) >/dev/null && \
-				$(MAKEBANNER) -N $(BANNER_ICON_NAME) $(BANNER_SPEC) $(TARGETS)
+include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
+
+ICON_DIR			= ./icon
+
+BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
+BANNER_SPEC			= banner$(GAMECODE)_v3.bsf
+
+TARGETS				= $(GAMECODE).bnr
+INSTALL_DIR			= ./
+INSTALL_TARGETS		= $(TARGETS)
+
+BANNER_ICON_NAME	= $(basename $(BANNER_ICON))
+
+LDIRT_CLEAN			= $(TARGETS) \
+					  $(BANNER_ICON_NAME).nbfs \
+					  $(BANNER_ICON_NAME).nbfc \
+					  $(BANNER_ICON_NAME).nbfp \
+					  $(TARGETS:.bnr=.srl)
+
+include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
+
+#----------------------------------------------------------------------------
+#  build
+#----------------------------------------------------------------------------
+do-build:		$(TARGETS)
+
+$(TARGETS):		$(BANNER_SPEC) $(BANNER_ICON)
+				$(NTEXCONV) -no -bg -bgb -bgnc $(BANNER_ICON) >/dev/null && \
+				$(MAKEBANNER) -N $(BANNER_ICON_NAME) $(BANNER_SPEC) $(TARGETS)
diff --git a/build/tests/DisplaySystemInformation/banner/Makefile.025A b/build/tests/DisplaySystemInformation/banner/Makefile.025A
index 7ef2a332..0d270f76 100644
--- a/build/tests/DisplaySystemInformation/banner/Makefile.025A
+++ b/build/tests/DisplaySystemInformation/banner/Makefile.025A
@@ -1,48 +1,48 @@
-#! make -f
-#----------------------------------------------------------------------------
-# Project:  TwlIPL
-# File:     Makefile
-#
-# Copyright 2007 Nintendo.  All rights reserved.
-#
-# These coded instructions, statements, and computer programs contain
-# proprietary information of Nintendo of America Inc. and/or Nintendo
-# Company Ltd., and are protected by Federal copyright law.  They may
-# not be disclosed to third parties or copied or duplicated in any form,
-# in whole or in part, without the prior written consent of Nintendo.
-#
-# $Date::            $
-# $Rev$
-# $Author$
-#----------------------------------------------------------------------------
-
+#! make -f
+#----------------------------------------------------------------------------
+# Project:  TwlIPL
+# File:     Makefile
+#
+# Copyright 2007 Nintendo.  All rights reserved.
+#
+# These coded instructions, statements, and computer programs contain
+# proprietary information of Nintendo of America Inc. and/or Nintendo
+# Company Ltd., and are protected by Federal copyright law.  They may
+# not be disclosed to third parties or copied or duplicated in any form,
+# in whole or in part, without the prior written consent of Nintendo.
+#
+# $Date::            $
+# $Rev$
+# $Author$
+#----------------------------------------------------------------------------
+
 GAMECODE	=	025A
-include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
-
-ICON_DIR			= ./icon
-
-BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
-BANNER_SPEC			= banner_v3.bsf
-
-TARGETS				= $(GAMECODE).bnr
-INSTALL_DIR			= ./
-INSTALL_TARGETS		= $(TARGETS)
-
-BANNER_ICON_NAME	= $(basename $(BANNER_ICON))
-
-LDIRT_CLEAN			= $(TARGETS) \
-					  $(BANNER_ICON_NAME).nbfs \
-					  $(BANNER_ICON_NAME).nbfc \
-					  $(BANNER_ICON_NAME).nbfp \
-					  $(TARGETS:.bnr=.srl)
-
-include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
-
-#----------------------------------------------------------------------------
-#  build
-#----------------------------------------------------------------------------
-do-build:		$(TARGETS)
-
-$(TARGETS):		$(BANNER_SPEC) $(BANNER_ICON)
-				$(NTEXCONV) -no -bg -bgb -bgnc $(BANNER_ICON) >/dev/null && \
-				$(MAKEBANNER) -N $(BANNER_ICON_NAME) $(BANNER_SPEC) $(TARGETS)
+include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
+
+ICON_DIR			= ./icon
+
+BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
+BANNER_SPEC			= banner$(GAMECODE)_v3.bsf
+
+TARGETS				= $(GAMECODE).bnr
+INSTALL_DIR			= ./
+INSTALL_TARGETS		= $(TARGETS)
+
+BANNER_ICON_NAME	= $(basename $(BANNER_ICON))
+
+LDIRT_CLEAN			= $(TARGETS) \
+					  $(BANNER_ICON_NAME).nbfs \
+					  $(BANNER_ICON_NAME).nbfc \
+					  $(BANNER_ICON_NAME).nbfp \
+					  $(TARGETS:.bnr=.srl)
+
+include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
+
+#----------------------------------------------------------------------------
+#  build
+#----------------------------------------------------------------------------
+do-build:		$(TARGETS)
+
+$(TARGETS):		$(BANNER_SPEC) $(BANNER_ICON)
+				$(NTEXCONV) -no -bg -bgb -bgnc $(BANNER_ICON) >/dev/null && \
+				$(MAKEBANNER) -N $(BANNER_ICON_NAME) $(BANNER_SPEC) $(TARGETS)
diff --git a/build/tests/DisplaySystemInformation/banner/Makefile.0B0A b/build/tests/DisplaySystemInformation/banner/Makefile.0B0A
index 3e4825e3..6a1317f5 100644
--- a/build/tests/DisplaySystemInformation/banner/Makefile.0B0A
+++ b/build/tests/DisplaySystemInformation/banner/Makefile.0B0A
@@ -1,48 +1,48 @@
-#! make -f
-#----------------------------------------------------------------------------
-# Project:  TwlIPL
-# File:     Makefile
-#
-# Copyright 2007 Nintendo.  All rights reserved.
-#
-# These coded instructions, statements, and computer programs contain
-# proprietary information of Nintendo of America Inc. and/or Nintendo
-# Company Ltd., and are protected by Federal copyright law.  They may
-# not be disclosed to third parties or copied or duplicated in any form,
-# in whole or in part, without the prior written consent of Nintendo.
-#
-# $Date::            $
-# $Rev$
-# $Author$
-#----------------------------------------------------------------------------
-
+#! make -f
+#----------------------------------------------------------------------------
+# Project:  TwlIPL
+# File:     Makefile
+#
+# Copyright 2007 Nintendo.  All rights reserved.
+#
+# These coded instructions, statements, and computer programs contain
+# proprietary information of Nintendo of America Inc. and/or Nintendo
+# Company Ltd., and are protected by Federal copyright law.  They may
+# not be disclosed to third parties or copied or duplicated in any form,
+# in whole or in part, without the prior written consent of Nintendo.
+#
+# $Date::            $
+# $Rev$
+# $Author$
+#----------------------------------------------------------------------------
+
 GAMECODE	=	0B0A
-include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
-
-ICON_DIR			= ./icon
-
-BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
-BANNER_SPEC			= banner_v3.bsf
-
-TARGETS				= $(GAMECODE).bnr
-INSTALL_DIR			= ./
-INSTALL_TARGETS		= $(TARGETS)
-
-BANNER_ICON_NAME	= $(basename $(BANNER_ICON))
-
-LDIRT_CLEAN			= $(TARGETS) \
-					  $(BANNER_ICON_NAME).nbfs \
-					  $(BANNER_ICON_NAME).nbfc \
-					  $(BANNER_ICON_NAME).nbfp \
-					  $(TARGETS:.bnr=.srl)
-
-include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
-
-#----------------------------------------------------------------------------
-#  build
-#----------------------------------------------------------------------------
-do-build:		$(TARGETS)
-
-$(TARGETS):		$(BANNER_SPEC) $(BANNER_ICON)
-				$(NTEXCONV) -no -bg -bgb -bgnc $(BANNER_ICON) >/dev/null && \
-				$(MAKEBANNER) -N $(BANNER_ICON_NAME) $(BANNER_SPEC) $(TARGETS)
+include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
+
+ICON_DIR			= ./icon
+
+BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
+BANNER_SPEC			= banner$(GAMECODE)_v3.bsf
+
+TARGETS				= $(GAMECODE).bnr
+INSTALL_DIR			= ./
+INSTALL_TARGETS		= $(TARGETS)
+
+BANNER_ICON_NAME	= $(basename $(BANNER_ICON))
+
+LDIRT_CLEAN			= $(TARGETS) \
+					  $(BANNER_ICON_NAME).nbfs \
+					  $(BANNER_ICON_NAME).nbfc \
+					  $(BANNER_ICON_NAME).nbfp \
+					  $(TARGETS:.bnr=.srl)
+
+include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
+
+#----------------------------------------------------------------------------
+#  build
+#----------------------------------------------------------------------------
+do-build:		$(TARGETS)
+
+$(TARGETS):		$(BANNER_SPEC) $(BANNER_ICON)
+				$(NTEXCONV) -no -bg -bgb -bgnc $(BANNER_ICON) >/dev/null && \
+				$(MAKEBANNER) -N $(BANNER_ICON_NAME) $(BANNER_SPEC) $(TARGETS)
diff --git a/build/tests/DisplaySystemInformation/banner/Makefile.0B1A b/build/tests/DisplaySystemInformation/banner/Makefile.0B1A
index 751e03d9..8cd89489 100644
--- a/build/tests/DisplaySystemInformation/banner/Makefile.0B1A
+++ b/build/tests/DisplaySystemInformation/banner/Makefile.0B1A
@@ -1,48 +1,48 @@
-#! make -f
-#----------------------------------------------------------------------------
-# Project:  TwlIPL
-# File:     Makefile
-#
-# Copyright 2007 Nintendo.  All rights reserved.
-#
-# These coded instructions, statements, and computer programs contain
-# proprietary information of Nintendo of America Inc. and/or Nintendo
-# Company Ltd., and are protected by Federal copyright law.  They may
-# not be disclosed to third parties or copied or duplicated in any form,
-# in whole or in part, without the prior written consent of Nintendo.
-#
-# $Date::            $
-# $Rev$
-# $Author$
-#----------------------------------------------------------------------------
-
+#! make -f
+#----------------------------------------------------------------------------
+# Project:  TwlIPL
+# File:     Makefile
+#
+# Copyright 2007 Nintendo.  All rights reserved.
+#
+# These coded instructions, statements, and computer programs contain
+# proprietary information of Nintendo of America Inc. and/or Nintendo
+# Company Ltd., and are protected by Federal copyright law.  They may
+# not be disclosed to third parties or copied or duplicated in any form,
+# in whole or in part, without the prior written consent of Nintendo.
+#
+# $Date::            $
+# $Rev$
+# $Author$
+#----------------------------------------------------------------------------
+
 GAMECODE	=	0B1A
-include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
-
-ICON_DIR			= ./icon
-
-BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
-BANNER_SPEC			= banner_v3.bsf
-
-TARGETS				= $(GAMECODE).bnr
-INSTALL_DIR			= ./
-INSTALL_TARGETS		= $(TARGETS)
-
-BANNER_ICON_NAME	= $(basename $(BANNER_ICON))
-
-LDIRT_CLEAN			= $(TARGETS) \
-					  $(BANNER_ICON_NAME).nbfs \
-					  $(BANNER_ICON_NAME).nbfc \
-					  $(BANNER_ICON_NAME).nbfp \
-					  $(TARGETS:.bnr=.srl)
-
-include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
-
-#----------------------------------------------------------------------------
-#  build
-#----------------------------------------------------------------------------
-do-build:		$(TARGETS)
-
-$(TARGETS):		$(BANNER_SPEC) $(BANNER_ICON)
-				$(NTEXCONV) -no -bg -bgb -bgnc $(BANNER_ICON) >/dev/null && \
-				$(MAKEBANNER) -N $(BANNER_ICON_NAME) $(BANNER_SPEC) $(TARGETS)
+include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
+
+ICON_DIR			= ./icon
+
+BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
+BANNER_SPEC			= banner$(GAMECODE)_v3.bsf
+
+TARGETS				= $(GAMECODE).bnr
+INSTALL_DIR			= ./
+INSTALL_TARGETS		= $(TARGETS)
+
+BANNER_ICON_NAME	= $(basename $(BANNER_ICON))
+
+LDIRT_CLEAN			= $(TARGETS) \
+					  $(BANNER_ICON_NAME).nbfs \
+					  $(BANNER_ICON_NAME).nbfc \
+					  $(BANNER_ICON_NAME).nbfp \
+					  $(TARGETS:.bnr=.srl)
+
+include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
+
+#----------------------------------------------------------------------------
+#  build
+#----------------------------------------------------------------------------
+do-build:		$(TARGETS)
+
+$(TARGETS):		$(BANNER_SPEC) $(BANNER_ICON)
+				$(NTEXCONV) -no -bg -bgb -bgnc $(BANNER_ICON) >/dev/null && \
+				$(MAKEBANNER) -N $(BANNER_ICON_NAME) $(BANNER_SPEC) $(TARGETS)
diff --git a/build/tests/DisplaySystemInformation/banner/Makefile.0B2A b/build/tests/DisplaySystemInformation/banner/Makefile.0B2A
index 22095b66..7a5328be 100644
--- a/build/tests/DisplaySystemInformation/banner/Makefile.0B2A
+++ b/build/tests/DisplaySystemInformation/banner/Makefile.0B2A
@@ -1,48 +1,48 @@
-#! make -f
-#----------------------------------------------------------------------------
-# Project:  TwlIPL
-# File:     Makefile
-#
-# Copyright 2007 Nintendo.  All rights reserved.
-#
-# These coded instructions, statements, and computer programs contain
-# proprietary information of Nintendo of America Inc. and/or Nintendo
-# Company Ltd., and are protected by Federal copyright law.  They may
-# not be disclosed to third parties or copied or duplicated in any form,
-# in whole or in part, without the prior written consent of Nintendo.
-#
-# $Date::            $
-# $Rev$
-# $Author$
-#----------------------------------------------------------------------------
-
+#! make -f
+#----------------------------------------------------------------------------
+# Project:  TwlIPL
+# File:     Makefile
+#
+# Copyright 2007 Nintendo.  All rights reserved.
+#
+# These coded instructions, statements, and computer programs contain
+# proprietary information of Nintendo of America Inc. and/or Nintendo
+# Company Ltd., and are protected by Federal copyright law.  They may
+# not be disclosed to third parties or copied or duplicated in any form,
+# in whole or in part, without the prior written consent of Nintendo.
+#
+# $Date::            $
+# $Rev$
+# $Author$
+#----------------------------------------------------------------------------
+
 GAMECODE	=	0B2A
-include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
-
-ICON_DIR			= ./icon
-
-BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
-BANNER_SPEC			= banner_v3.bsf
-
-TARGETS				= $(GAMECODE).bnr
-INSTALL_DIR			= ./
-INSTALL_TARGETS		= $(TARGETS)
-
-BANNER_ICON_NAME	= $(basename $(BANNER_ICON))
-
-LDIRT_CLEAN			= $(TARGETS) \
-					  $(BANNER_ICON_NAME).nbfs \
-					  $(BANNER_ICON_NAME).nbfc \
-					  $(BANNER_ICON_NAME).nbfp \
-					  $(TARGETS:.bnr=.srl)
-
-include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
-
-#----------------------------------------------------------------------------
-#  build
-#----------------------------------------------------------------------------
-do-build:		$(TARGETS)
-
-$(TARGETS):		$(BANNER_SPEC) $(BANNER_ICON)
-				$(NTEXCONV) -no -bg -bgb -bgnc $(BANNER_ICON) >/dev/null && \
-				$(MAKEBANNER) -N $(BANNER_ICON_NAME) $(BANNER_SPEC) $(TARGETS)
+include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
+
+ICON_DIR			= ./icon
+
+BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
+BANNER_SPEC			= banner$(GAMECODE)_v3.bsf
+
+TARGETS				= $(GAMECODE).bnr
+INSTALL_DIR			= ./
+INSTALL_TARGETS		= $(TARGETS)
+
+BANNER_ICON_NAME	= $(basename $(BANNER_ICON))
+
+LDIRT_CLEAN			= $(TARGETS) \
+					  $(BANNER_ICON_NAME).nbfs \
+					  $(BANNER_ICON_NAME).nbfc \
+					  $(BANNER_ICON_NAME).nbfp \
+					  $(TARGETS:.bnr=.srl)
+
+include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
+
+#----------------------------------------------------------------------------
+#  build
+#----------------------------------------------------------------------------
+do-build:		$(TARGETS)
+
+$(TARGETS):		$(BANNER_SPEC) $(BANNER_ICON)
+				$(NTEXCONV) -no -bg -bgb -bgnc $(BANNER_ICON) >/dev/null && \
+				$(MAKEBANNER) -N $(BANNER_ICON_NAME) $(BANNER_SPEC) $(TARGETS)
diff --git a/build/tests/DisplaySystemInformation/banner/Makefile.0B3A b/build/tests/DisplaySystemInformation/banner/Makefile.0B3A
index 4d74eb63..9840501b 100644
--- a/build/tests/DisplaySystemInformation/banner/Makefile.0B3A
+++ b/build/tests/DisplaySystemInformation/banner/Makefile.0B3A
@@ -1,48 +1,48 @@
-#! make -f
-#----------------------------------------------------------------------------
-# Project:  TwlIPL
-# File:     Makefile
-#
-# Copyright 2007 Nintendo.  All rights reserved.
-#
-# These coded instructions, statements, and computer programs contain
-# proprietary information of Nintendo of America Inc. and/or Nintendo
-# Company Ltd., and are protected by Federal copyright law.  They may
-# not be disclosed to third parties or copied or duplicated in any form,
-# in whole or in part, without the prior written consent of Nintendo.
-#
-# $Date::            $
-# $Rev$
-# $Author$
-#----------------------------------------------------------------------------
-
+#! make -f
+#----------------------------------------------------------------------------
+# Project:  TwlIPL
+# File:     Makefile
+#
+# Copyright 2007 Nintendo.  All rights reserved.
+#
+# These coded instructions, statements, and computer programs contain
+# proprietary information of Nintendo of America Inc. and/or Nintendo
+# Company Ltd., and are protected by Federal copyright law.  They may
+# not be disclosed to third parties or copied or duplicated in any form,
+# in whole or in part, without the prior written consent of Nintendo.
+#
+# $Date::            $
+# $Rev$
+# $Author$
+#----------------------------------------------------------------------------
+
 GAMECODE	=	0B3A
-include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
-
-ICON_DIR			= ./icon
-
-BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
-BANNER_SPEC			= banner_v3.bsf
-
-TARGETS				= $(GAMECODE).bnr
-INSTALL_DIR			= ./
-INSTALL_TARGETS		= $(TARGETS)
-
-BANNER_ICON_NAME	= $(basename $(BANNER_ICON))
-
-LDIRT_CLEAN			= $(TARGETS) \
-					  $(BANNER_ICON_NAME).nbfs \
-					  $(BANNER_ICON_NAME).nbfc \
-					  $(BANNER_ICON_NAME).nbfp \
-					  $(TARGETS:.bnr=.srl)
-
-include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
-
-#----------------------------------------------------------------------------
-#  build
-#----------------------------------------------------------------------------
-do-build:		$(TARGETS)
-
-$(TARGETS):		$(BANNER_SPEC) $(BANNER_ICON)
-				$(NTEXCONV) -no -bg -bgb -bgnc $(BANNER_ICON) >/dev/null && \
-				$(MAKEBANNER) -N $(BANNER_ICON_NAME) $(BANNER_SPEC) $(TARGETS)
+include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
+
+ICON_DIR			= ./icon
+
+BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
+BANNER_SPEC			= banner$(GAMECODE)_v3.bsf
+
+TARGETS				= $(GAMECODE).bnr
+INSTALL_DIR			= ./
+INSTALL_TARGETS		= $(TARGETS)
+
+BANNER_ICON_NAME	= $(basename $(BANNER_ICON))
+
+LDIRT_CLEAN			= $(TARGETS) \
+					  $(BANNER_ICON_NAME).nbfs \
+					  $(BANNER_ICON_NAME).nbfc \
+					  $(BANNER_ICON_NAME).nbfp \
+					  $(TARGETS:.bnr=.srl)
+
+include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
+
+#----------------------------------------------------------------------------
+#  build
+#----------------------------------------------------------------------------
+do-build:		$(TARGETS)
+
+$(TARGETS):		$(BANNER_SPEC) $(BANNER_ICON)
+				$(NTEXCONV) -no -bg -bgb -bgnc $(BANNER_ICON) >/dev/null && \
+				$(MAKEBANNER) -N $(BANNER_ICON_NAME) $(BANNER_SPEC) $(TARGETS)
diff --git a/build/tests/DisplaySystemInformation/banner/Makefile.0B4A b/build/tests/DisplaySystemInformation/banner/Makefile.0B4A
index 45d4fe3e..d5dc7e7e 100644
--- a/build/tests/DisplaySystemInformation/banner/Makefile.0B4A
+++ b/build/tests/DisplaySystemInformation/banner/Makefile.0B4A
@@ -1,48 +1,48 @@
-#! make -f
-#----------------------------------------------------------------------------
-# Project:  TwlIPL
-# File:     Makefile
-#
-# Copyright 2007 Nintendo.  All rights reserved.
-#
-# These coded instructions, statements, and computer programs contain
-# proprietary information of Nintendo of America Inc. and/or Nintendo
-# Company Ltd., and are protected by Federal copyright law.  They may
-# not be disclosed to third parties or copied or duplicated in any form,
-# in whole or in part, without the prior written consent of Nintendo.
-#
-# $Date::            $
-# $Rev$
-# $Author$
-#----------------------------------------------------------------------------
-
+#! make -f
+#----------------------------------------------------------------------------
+# Project:  TwlIPL
+# File:     Makefile
+#
+# Copyright 2007 Nintendo.  All rights reserved.
+#
+# These coded instructions, statements, and computer programs contain
+# proprietary information of Nintendo of America Inc. and/or Nintendo
+# Company Ltd., and are protected by Federal copyright law.  They may
+# not be disclosed to third parties or copied or duplicated in any form,
+# in whole or in part, without the prior written consent of Nintendo.
+#
+# $Date::            $
+# $Rev$
+# $Author$
+#----------------------------------------------------------------------------
+
 GAMECODE	=	0B4A
-include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
-
-ICON_DIR			= ./icon
-
-BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
-BANNER_SPEC			= banner_v3.bsf
-
-TARGETS				= $(GAMECODE).bnr
-INSTALL_DIR			= ./
-INSTALL_TARGETS		= $(TARGETS)
-
-BANNER_ICON_NAME	= $(basename $(BANNER_ICON))
-
-LDIRT_CLEAN			= $(TARGETS) \
-					  $(BANNER_ICON_NAME).nbfs \
-					  $(BANNER_ICON_NAME).nbfc \
-					  $(BANNER_ICON_NAME).nbfp \
-					  $(TARGETS:.bnr=.srl)
-
-include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
-
-#----------------------------------------------------------------------------
-#  build
-#----------------------------------------------------------------------------
-do-build:		$(TARGETS)
-
-$(TARGETS):		$(BANNER_SPEC) $(BANNER_ICON)
-				$(NTEXCONV) -no -bg -bgb -bgnc $(BANNER_ICON) >/dev/null && \
-				$(MAKEBANNER) -N $(BANNER_ICON_NAME) $(BANNER_SPEC) $(TARGETS)
+include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
+
+ICON_DIR			= ./icon
+
+BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
+BANNER_SPEC			= banner$(GAMECODE)_v3.bsf
+
+TARGETS				= $(GAMECODE).bnr
+INSTALL_DIR			= ./
+INSTALL_TARGETS		= $(TARGETS)
+
+BANNER_ICON_NAME	= $(basename $(BANNER_ICON))
+
+LDIRT_CLEAN			= $(TARGETS) \
+					  $(BANNER_ICON_NAME).nbfs \
+					  $(BANNER_ICON_NAME).nbfc \
+					  $(BANNER_ICON_NAME).nbfp \
+					  $(TARGETS:.bnr=.srl)
+
+include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
+
+#----------------------------------------------------------------------------
+#  build
+#----------------------------------------------------------------------------
+do-build:		$(TARGETS)
+
+$(TARGETS):		$(BANNER_SPEC) $(BANNER_ICON)
+				$(NTEXCONV) -no -bg -bgb -bgnc $(BANNER_ICON) >/dev/null && \
+				$(MAKEBANNER) -N $(BANNER_ICON_NAME) $(BANNER_SPEC) $(TARGETS)
diff --git a/build/tests/DisplaySystemInformation/banner/Makefile.0B5A b/build/tests/DisplaySystemInformation/banner/Makefile.0B5A
index b18c40f9..39dd75c0 100644
--- a/build/tests/DisplaySystemInformation/banner/Makefile.0B5A
+++ b/build/tests/DisplaySystemInformation/banner/Makefile.0B5A
@@ -1,48 +1,48 @@
-#! make -f
-#----------------------------------------------------------------------------
-# Project:  TwlIPL
-# File:     Makefile
-#
-# Copyright 2007 Nintendo.  All rights reserved.
-#
-# These coded instructions, statements, and computer programs contain
-# proprietary information of Nintendo of America Inc. and/or Nintendo
-# Company Ltd., and are protected by Federal copyright law.  They may
-# not be disclosed to third parties or copied or duplicated in any form,
-# in whole or in part, without the prior written consent of Nintendo.
-#
-# $Date::            $
-# $Rev$
-# $Author$
-#----------------------------------------------------------------------------
-
+#! make -f
+#----------------------------------------------------------------------------
+# Project:  TwlIPL
+# File:     Makefile
+#
+# Copyright 2007 Nintendo.  All rights reserved.
+#
+# These coded instructions, statements, and computer programs contain
+# proprietary information of Nintendo of America Inc. and/or Nintendo
+# Company Ltd., and are protected by Federal copyright law.  They may
+# not be disclosed to third parties or copied or duplicated in any form,
+# in whole or in part, without the prior written consent of Nintendo.
+#
+# $Date::            $
+# $Rev$
+# $Author$
+#----------------------------------------------------------------------------
+
 GAMECODE	=	0B5A
-include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
-
-ICON_DIR			= ./icon
-
-BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
-BANNER_SPEC			= banner_v3.bsf
-
-TARGETS				= $(GAMECODE).bnr
-INSTALL_DIR			= ./
-INSTALL_TARGETS		= $(TARGETS)
-
-BANNER_ICON_NAME	= $(basename $(BANNER_ICON))
-
-LDIRT_CLEAN			= $(TARGETS) \
-					  $(BANNER_ICON_NAME).nbfs \
-					  $(BANNER_ICON_NAME).nbfc \
-					  $(BANNER_ICON_NAME).nbfp \
-					  $(TARGETS:.bnr=.srl)
-
-include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
-
-#----------------------------------------------------------------------------
-#  build
-#----------------------------------------------------------------------------
-do-build:		$(TARGETS)
-
-$(TARGETS):		$(BANNER_SPEC) $(BANNER_ICON)
-				$(NTEXCONV) -no -bg -bgb -bgnc $(BANNER_ICON) >/dev/null && \
-				$(MAKEBANNER) -N $(BANNER_ICON_NAME) $(BANNER_SPEC) $(TARGETS)
+include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
+
+ICON_DIR			= ./icon
+
+BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
+BANNER_SPEC			= banner$(GAMECODE)_v3.bsf
+
+TARGETS				= $(GAMECODE).bnr
+INSTALL_DIR			= ./
+INSTALL_TARGETS		= $(TARGETS)
+
+BANNER_ICON_NAME	= $(basename $(BANNER_ICON))
+
+LDIRT_CLEAN			= $(TARGETS) \
+					  $(BANNER_ICON_NAME).nbfs \
+					  $(BANNER_ICON_NAME).nbfc \
+					  $(BANNER_ICON_NAME).nbfp \
+					  $(TARGETS:.bnr=.srl)
+
+include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
+
+#----------------------------------------------------------------------------
+#  build
+#----------------------------------------------------------------------------
+do-build:		$(TARGETS)
+
+$(TARGETS):		$(BANNER_SPEC) $(BANNER_ICON)
+				$(NTEXCONV) -no -bg -bgb -bgnc $(BANNER_ICON) >/dev/null && \
+				$(MAKEBANNER) -N $(BANNER_ICON_NAME) $(BANNER_SPEC) $(TARGETS)
diff --git a/build/tests/DisplaySystemInformation/banner/Makefile.0B6A b/build/tests/DisplaySystemInformation/banner/Makefile.0B6A
index cd26a84d..7ea49c4d 100644
--- a/build/tests/DisplaySystemInformation/banner/Makefile.0B6A
+++ b/build/tests/DisplaySystemInformation/banner/Makefile.0B6A
@@ -1,48 +1,48 @@
-#! make -f
-#----------------------------------------------------------------------------
-# Project:  TwlIPL
-# File:     Makefile
-#
-# Copyright 2007 Nintendo.  All rights reserved.
-#
-# These coded instructions, statements, and computer programs contain
-# proprietary information of Nintendo of America Inc. and/or Nintendo
-# Company Ltd., and are protected by Federal copyright law.  They may
-# not be disclosed to third parties or copied or duplicated in any form,
-# in whole or in part, without the prior written consent of Nintendo.
-#
-# $Date::            $
-# $Rev$
-# $Author$
-#----------------------------------------------------------------------------
-
+#! make -f
+#----------------------------------------------------------------------------
+# Project:  TwlIPL
+# File:     Makefile
+#
+# Copyright 2007 Nintendo.  All rights reserved.
+#
+# These coded instructions, statements, and computer programs contain
+# proprietary information of Nintendo of America Inc. and/or Nintendo
+# Company Ltd., and are protected by Federal copyright law.  They may
+# not be disclosed to third parties or copied or duplicated in any form,
+# in whole or in part, without the prior written consent of Nintendo.
+#
+# $Date::            $
+# $Rev$
+# $Author$
+#----------------------------------------------------------------------------
+
 GAMECODE	=	0B6A
-include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
-
-ICON_DIR			= ./icon
-
-BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
-BANNER_SPEC			= banner_v3.bsf
-
-TARGETS				= $(GAMECODE).bnr
-INSTALL_DIR			= ./
-INSTALL_TARGETS		= $(TARGETS)
-
-BANNER_ICON_NAME	= $(basename $(BANNER_ICON))
-
-LDIRT_CLEAN			= $(TARGETS) \
-					  $(BANNER_ICON_NAME).nbfs \
-					  $(BANNER_ICON_NAME).nbfc \
-					  $(BANNER_ICON_NAME).nbfp \
-					  $(TARGETS:.bnr=.srl)
-
-include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
-
-#----------------------------------------------------------------------------
-#  build
-#----------------------------------------------------------------------------
-do-build:		$(TARGETS)
-
-$(TARGETS):		$(BANNER_SPEC) $(BANNER_ICON)
-				$(NTEXCONV) -no -bg -bgb -bgnc $(BANNER_ICON) >/dev/null && \
-				$(MAKEBANNER) -N $(BANNER_ICON_NAME) $(BANNER_SPEC) $(TARGETS)
+include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
+
+ICON_DIR			= ./icon
+
+BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
+BANNER_SPEC			= banner$(GAMECODE)_v3.bsf
+
+TARGETS				= $(GAMECODE).bnr
+INSTALL_DIR			= ./
+INSTALL_TARGETS		= $(TARGETS)
+
+BANNER_ICON_NAME	= $(basename $(BANNER_ICON))
+
+LDIRT_CLEAN			= $(TARGETS) \
+					  $(BANNER_ICON_NAME).nbfs \
+					  $(BANNER_ICON_NAME).nbfc \
+					  $(BANNER_ICON_NAME).nbfp \
+					  $(TARGETS:.bnr=.srl)
+
+include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
+
+#----------------------------------------------------------------------------
+#  build
+#----------------------------------------------------------------------------
+do-build:		$(TARGETS)
+
+$(TARGETS):		$(BANNER_SPEC) $(BANNER_ICON)
+				$(NTEXCONV) -no -bg -bgb -bgnc $(BANNER_ICON) >/dev/null && \
+				$(MAKEBANNER) -N $(BANNER_ICON_NAME) $(BANNER_SPEC) $(TARGETS)
diff --git a/build/tests/DisplaySystemInformation/banner/Makefile.0B7A b/build/tests/DisplaySystemInformation/banner/Makefile.0B7A
index d98d708d..29b6af03 100644
--- a/build/tests/DisplaySystemInformation/banner/Makefile.0B7A
+++ b/build/tests/DisplaySystemInformation/banner/Makefile.0B7A
@@ -1,48 +1,48 @@
-#! make -f
-#----------------------------------------------------------------------------
-# Project:  TwlIPL
-# File:     Makefile
-#
-# Copyright 2007 Nintendo.  All rights reserved.
-#
-# These coded instructions, statements, and computer programs contain
-# proprietary information of Nintendo of America Inc. and/or Nintendo
-# Company Ltd., and are protected by Federal copyright law.  They may
-# not be disclosed to third parties or copied or duplicated in any form,
-# in whole or in part, without the prior written consent of Nintendo.
-#
-# $Date::            $
-# $Rev$
-# $Author$
-#----------------------------------------------------------------------------
-
+#! make -f
+#----------------------------------------------------------------------------
+# Project:  TwlIPL
+# File:     Makefile
+#
+# Copyright 2007 Nintendo.  All rights reserved.
+#
+# These coded instructions, statements, and computer programs contain
+# proprietary information of Nintendo of America Inc. and/or Nintendo
+# Company Ltd., and are protected by Federal copyright law.  They may
+# not be disclosed to third parties or copied or duplicated in any form,
+# in whole or in part, without the prior written consent of Nintendo.
+#
+# $Date::            $
+# $Rev$
+# $Author$
+#----------------------------------------------------------------------------
+
 GAMECODE	=	0B7A
-include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
-
-ICON_DIR			= ./icon
-
-BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
-BANNER_SPEC			= banner_v3.bsf
-
-TARGETS				= $(GAMECODE).bnr
-INSTALL_DIR			= ./
-INSTALL_TARGETS		= $(TARGETS)
-
-BANNER_ICON_NAME	= $(basename $(BANNER_ICON))
-
-LDIRT_CLEAN			= $(TARGETS) \
-					  $(BANNER_ICON_NAME).nbfs \
-					  $(BANNER_ICON_NAME).nbfc \
-					  $(BANNER_ICON_NAME).nbfp \
-					  $(TARGETS:.bnr=.srl)
-
-include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
-
-#----------------------------------------------------------------------------
-#  build
-#----------------------------------------------------------------------------
-do-build:		$(TARGETS)
-
-$(TARGETS):		$(BANNER_SPEC) $(BANNER_ICON)
-				$(NTEXCONV) -no -bg -bgb -bgnc $(BANNER_ICON) >/dev/null && \
-				$(MAKEBANNER) -N $(BANNER_ICON_NAME) $(BANNER_SPEC) $(TARGETS)
+include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
+
+ICON_DIR			= ./icon
+
+BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
+BANNER_SPEC			= banner$(GAMECODE)_v3.bsf
+
+TARGETS				= $(GAMECODE).bnr
+INSTALL_DIR			= ./
+INSTALL_TARGETS		= $(TARGETS)
+
+BANNER_ICON_NAME	= $(basename $(BANNER_ICON))
+
+LDIRT_CLEAN			= $(TARGETS) \
+					  $(BANNER_ICON_NAME).nbfs \
+					  $(BANNER_ICON_NAME).nbfc \
+					  $(BANNER_ICON_NAME).nbfp \
+					  $(TARGETS:.bnr=.srl)
+
+include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
+
+#----------------------------------------------------------------------------
+#  build
+#----------------------------------------------------------------------------
+do-build:		$(TARGETS)
+
+$(TARGETS):		$(BANNER_SPEC) $(BANNER_ICON)
+				$(NTEXCONV) -no -bg -bgb -bgnc $(BANNER_ICON) >/dev/null && \
+				$(MAKEBANNER) -N $(BANNER_ICON_NAME) $(BANNER_SPEC) $(TARGETS)
diff --git a/build/tests/DisplaySystemInformation/banner/Makefile.0B8A b/build/tests/DisplaySystemInformation/banner/Makefile.0B8A
index ad87049b..2792ec15 100644
--- a/build/tests/DisplaySystemInformation/banner/Makefile.0B8A
+++ b/build/tests/DisplaySystemInformation/banner/Makefile.0B8A
@@ -1,48 +1,48 @@
-#! make -f
-#----------------------------------------------------------------------------
-# Project:  TwlIPL
-# File:     Makefile
-#
-# Copyright 2007 Nintendo.  All rights reserved.
-#
-# These coded instructions, statements, and computer programs contain
-# proprietary information of Nintendo of America Inc. and/or Nintendo
-# Company Ltd., and are protected by Federal copyright law.  They may
-# not be disclosed to third parties or copied or duplicated in any form,
-# in whole or in part, without the prior written consent of Nintendo.
-#
-# $Date::            $
-# $Rev$
-# $Author$
-#----------------------------------------------------------------------------
-
+#! make -f
+#----------------------------------------------------------------------------
+# Project:  TwlIPL
+# File:     Makefile
+#
+# Copyright 2007 Nintendo.  All rights reserved.
+#
+# These coded instructions, statements, and computer programs contain
+# proprietary information of Nintendo of America Inc. and/or Nintendo
+# Company Ltd., and are protected by Federal copyright law.  They may
+# not be disclosed to third parties or copied or duplicated in any form,
+# in whole or in part, without the prior written consent of Nintendo.
+#
+# $Date::            $
+# $Rev$
+# $Author$
+#----------------------------------------------------------------------------
+
 GAMECODE	=	0B8A
-include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
-
-ICON_DIR			= ./icon
-
-BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
-BANNER_SPEC			= banner_v3.bsf
-
-TARGETS				= $(GAMECODE).bnr
-INSTALL_DIR			= ./
-INSTALL_TARGETS		= $(TARGETS)
-
-BANNER_ICON_NAME	= $(basename $(BANNER_ICON))
-
-LDIRT_CLEAN			= $(TARGETS) \
-					  $(BANNER_ICON_NAME).nbfs \
-					  $(BANNER_ICON_NAME).nbfc \
-					  $(BANNER_ICON_NAME).nbfp \
-					  $(TARGETS:.bnr=.srl)
-
-include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
-
-#----------------------------------------------------------------------------
-#  build
-#----------------------------------------------------------------------------
-do-build:		$(TARGETS)
-
-$(TARGETS):		$(BANNER_SPEC) $(BANNER_ICON)
-				$(NTEXCONV) -no -bg -bgb -bgnc $(BANNER_ICON) >/dev/null && \
-				$(MAKEBANNER) -N $(BANNER_ICON_NAME) $(BANNER_SPEC) $(TARGETS)
+include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
+
+ICON_DIR			= ./icon
+
+BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
+BANNER_SPEC			= banner$(GAMECODE)_v3.bsf
+
+TARGETS				= $(GAMECODE).bnr
+INSTALL_DIR			= ./
+INSTALL_TARGETS		= $(TARGETS)
+
+BANNER_ICON_NAME	= $(basename $(BANNER_ICON))
+
+LDIRT_CLEAN			= $(TARGETS) \
+					  $(BANNER_ICON_NAME).nbfs \
+					  $(BANNER_ICON_NAME).nbfc \
+					  $(BANNER_ICON_NAME).nbfp \
+					  $(TARGETS:.bnr=.srl)
+
+include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
+
+#----------------------------------------------------------------------------
+#  build
+#----------------------------------------------------------------------------
+do-build:		$(TARGETS)
+
+$(TARGETS):		$(BANNER_SPEC) $(BANNER_ICON)
+				$(NTEXCONV) -no -bg -bgb -bgnc $(BANNER_ICON) >/dev/null && \
+				$(MAKEBANNER) -N $(BANNER_ICON_NAME) $(BANNER_SPEC) $(TARGETS)
diff --git a/build/tests/DisplaySystemInformation/banner/Makefile.0B9A b/build/tests/DisplaySystemInformation/banner/Makefile.0B9A
index 093b0914..57f5b803 100644
--- a/build/tests/DisplaySystemInformation/banner/Makefile.0B9A
+++ b/build/tests/DisplaySystemInformation/banner/Makefile.0B9A
@@ -1,48 +1,48 @@
-#! make -f
-#----------------------------------------------------------------------------
-# Project:  TwlIPL
-# File:     Makefile
-#
-# Copyright 2007 Nintendo.  All rights reserved.
-#
-# These coded instructions, statements, and computer programs contain
-# proprietary information of Nintendo of America Inc. and/or Nintendo
-# Company Ltd., and are protected by Federal copyright law.  They may
-# not be disclosed to third parties or copied or duplicated in any form,
-# in whole or in part, without the prior written consent of Nintendo.
-#
-# $Date::            $
-# $Rev$
-# $Author$
-#----------------------------------------------------------------------------
-
+#! make -f
+#----------------------------------------------------------------------------
+# Project:  TwlIPL
+# File:     Makefile
+#
+# Copyright 2007 Nintendo.  All rights reserved.
+#
+# These coded instructions, statements, and computer programs contain
+# proprietary information of Nintendo of America Inc. and/or Nintendo
+# Company Ltd., and are protected by Federal copyright law.  They may
+# not be disclosed to third parties or copied or duplicated in any form,
+# in whole or in part, without the prior written consent of Nintendo.
+#
+# $Date::            $
+# $Rev$
+# $Author$
+#----------------------------------------------------------------------------
+
 GAMECODE	=	0B9A
-include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
-
-ICON_DIR			= ./icon
-
-BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
-BANNER_SPEC			= banner_v3.bsf
-
-TARGETS				= $(GAMECODE).bnr
-INSTALL_DIR			= ./
-INSTALL_TARGETS		= $(TARGETS)
-
-BANNER_ICON_NAME	= $(basename $(BANNER_ICON))
-
-LDIRT_CLEAN			= $(TARGETS) \
-					  $(BANNER_ICON_NAME).nbfs \
-					  $(BANNER_ICON_NAME).nbfc \
-					  $(BANNER_ICON_NAME).nbfp \
-					  $(TARGETS:.bnr=.srl)
-
-include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
-
-#----------------------------------------------------------------------------
-#  build
-#----------------------------------------------------------------------------
-do-build:		$(TARGETS)
-
-$(TARGETS):		$(BANNER_SPEC) $(BANNER_ICON)
-				$(NTEXCONV) -no -bg -bgb -bgnc $(BANNER_ICON) >/dev/null && \
-				$(MAKEBANNER) -N $(BANNER_ICON_NAME) $(BANNER_SPEC) $(TARGETS)
+include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
+
+ICON_DIR			= ./icon
+
+BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
+BANNER_SPEC			= banner$(GAMECODE)_v3.bsf
+
+TARGETS				= $(GAMECODE).bnr
+INSTALL_DIR			= ./
+INSTALL_TARGETS		= $(TARGETS)
+
+BANNER_ICON_NAME	= $(basename $(BANNER_ICON))
+
+LDIRT_CLEAN			= $(TARGETS) \
+					  $(BANNER_ICON_NAME).nbfs \
+					  $(BANNER_ICON_NAME).nbfc \
+					  $(BANNER_ICON_NAME).nbfp \
+					  $(TARGETS:.bnr=.srl)
+
+include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
+
+#----------------------------------------------------------------------------
+#  build
+#----------------------------------------------------------------------------
+do-build:		$(TARGETS)
+
+$(TARGETS):		$(BANNER_SPEC) $(BANNER_ICON)
+				$(NTEXCONV) -no -bg -bgb -bgnc $(BANNER_ICON) >/dev/null && \
+				$(MAKEBANNER) -N $(BANNER_ICON_NAME) $(BANNER_SPEC) $(TARGETS)
diff --git a/build/tests/DisplaySystemInformation/banner/Makefile.0BAA b/build/tests/DisplaySystemInformation/banner/Makefile.0BAA
index 5c3fc62f..99da9ee9 100644
--- a/build/tests/DisplaySystemInformation/banner/Makefile.0BAA
+++ b/build/tests/DisplaySystemInformation/banner/Makefile.0BAA
@@ -1,48 +1,48 @@
-#! make -f
-#----------------------------------------------------------------------------
-# Project:  TwlIPL
-# File:     Makefile
-#
-# Copyright 2007 Nintendo.  All rights reserved.
-#
-# These coded instructions, statements, and computer programs contain
-# proprietary information of Nintendo of America Inc. and/or Nintendo
-# Company Ltd., and are protected by Federal copyright law.  They may
-# not be disclosed to third parties or copied or duplicated in any form,
-# in whole or in part, without the prior written consent of Nintendo.
-#
-# $Date::            $
-# $Rev$
-# $Author$
-#----------------------------------------------------------------------------
-
+#! make -f
+#----------------------------------------------------------------------------
+# Project:  TwlIPL
+# File:     Makefile
+#
+# Copyright 2007 Nintendo.  All rights reserved.
+#
+# These coded instructions, statements, and computer programs contain
+# proprietary information of Nintendo of America Inc. and/or Nintendo
+# Company Ltd., and are protected by Federal copyright law.  They may
+# not be disclosed to third parties or copied or duplicated in any form,
+# in whole or in part, without the prior written consent of Nintendo.
+#
+# $Date::            $
+# $Rev$
+# $Author$
+#----------------------------------------------------------------------------
+
 GAMECODE	=	0BAA
-include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
-
-ICON_DIR			= ./icon
-
-BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
-BANNER_SPEC			= banner_v3.bsf
-
-TARGETS				= $(GAMECODE).bnr
-INSTALL_DIR			= ./
-INSTALL_TARGETS		= $(TARGETS)
-
-BANNER_ICON_NAME	= $(basename $(BANNER_ICON))
-
-LDIRT_CLEAN			= $(TARGETS) \
-					  $(BANNER_ICON_NAME).nbfs \
-					  $(BANNER_ICON_NAME).nbfc \
-					  $(BANNER_ICON_NAME).nbfp \
-					  $(TARGETS:.bnr=.srl)
-
-include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
-
-#----------------------------------------------------------------------------
-#  build
-#----------------------------------------------------------------------------
-do-build:		$(TARGETS)
-
-$(TARGETS):		$(BANNER_SPEC) $(BANNER_ICON)
-				$(NTEXCONV) -no -bg -bgb -bgnc $(BANNER_ICON) >/dev/null && \
-				$(MAKEBANNER) -N $(BANNER_ICON_NAME) $(BANNER_SPEC) $(TARGETS)
+include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
+
+ICON_DIR			= ./icon
+
+BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
+BANNER_SPEC			= banner$(GAMECODE)_v3.bsf
+
+TARGETS				= $(GAMECODE).bnr
+INSTALL_DIR			= ./
+INSTALL_TARGETS		= $(TARGETS)
+
+BANNER_ICON_NAME	= $(basename $(BANNER_ICON))
+
+LDIRT_CLEAN			= $(TARGETS) \
+					  $(BANNER_ICON_NAME).nbfs \
+					  $(BANNER_ICON_NAME).nbfc \
+					  $(BANNER_ICON_NAME).nbfp \
+					  $(TARGETS:.bnr=.srl)
+
+include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
+
+#----------------------------------------------------------------------------
+#  build
+#----------------------------------------------------------------------------
+do-build:		$(TARGETS)
+
+$(TARGETS):		$(BANNER_SPEC) $(BANNER_ICON)
+				$(NTEXCONV) -no -bg -bgb -bgnc $(BANNER_ICON) >/dev/null && \
+				$(MAKEBANNER) -N $(BANNER_ICON_NAME) $(BANNER_SPEC) $(TARGETS)
diff --git a/build/tests/DisplaySystemInformation/banner/Makefile.0BBA b/build/tests/DisplaySystemInformation/banner/Makefile.0BBA
index d3f8923a..f270f2e2 100644
--- a/build/tests/DisplaySystemInformation/banner/Makefile.0BBA
+++ b/build/tests/DisplaySystemInformation/banner/Makefile.0BBA
@@ -1,48 +1,48 @@
-#! make -f
-#----------------------------------------------------------------------------
-# Project:  TwlIPL
-# File:     Makefile
-#
-# Copyright 2007 Nintendo.  All rights reserved.
-#
-# These coded instructions, statements, and computer programs contain
-# proprietary information of Nintendo of America Inc. and/or Nintendo
-# Company Ltd., and are protected by Federal copyright law.  They may
-# not be disclosed to third parties or copied or duplicated in any form,
-# in whole or in part, without the prior written consent of Nintendo.
-#
-# $Date::            $
-# $Rev$
-# $Author$
-#----------------------------------------------------------------------------
-
+#! make -f
+#----------------------------------------------------------------------------
+# Project:  TwlIPL
+# File:     Makefile
+#
+# Copyright 2007 Nintendo.  All rights reserved.
+#
+# These coded instructions, statements, and computer programs contain
+# proprietary information of Nintendo of America Inc. and/or Nintendo
+# Company Ltd., and are protected by Federal copyright law.  They may
+# not be disclosed to third parties or copied or duplicated in any form,
+# in whole or in part, without the prior written consent of Nintendo.
+#
+# $Date::            $
+# $Rev$
+# $Author$
+#----------------------------------------------------------------------------
+
 GAMECODE	=	0BBA
-include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
-
-ICON_DIR			= ./icon
-
-BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
-BANNER_SPEC			= banner_v3.bsf
-
-TARGETS				= $(GAMECODE).bnr
-INSTALL_DIR			= ./
-INSTALL_TARGETS		= $(TARGETS)
-
-BANNER_ICON_NAME	= $(basename $(BANNER_ICON))
-
-LDIRT_CLEAN			= $(TARGETS) \
-					  $(BANNER_ICON_NAME).nbfs \
-					  $(BANNER_ICON_NAME).nbfc \
-					  $(BANNER_ICON_NAME).nbfp \
-					  $(TARGETS:.bnr=.srl)
-
-include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
-
-#----------------------------------------------------------------------------
-#  build
-#----------------------------------------------------------------------------
-do-build:		$(TARGETS)
-
-$(TARGETS):		$(BANNER_SPEC) $(BANNER_ICON)
-				$(NTEXCONV) -no -bg -bgb -bgnc $(BANNER_ICON) >/dev/null && \
-				$(MAKEBANNER) -N $(BANNER_ICON_NAME) $(BANNER_SPEC) $(TARGETS)
+include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
+
+ICON_DIR			= ./icon
+
+BANNER_ICON			= $(ICON_DIR)/$(GAMECODE).bmp
+BANNER_SPEC			= banner$(GAMECODE)_v3.bsf
+
+TARGETS				= $(GAMECODE).bnr
+INSTALL_DIR			= ./
+INSTALL_TARGETS		= $(TARGETS)
+
+BANNER_ICON_NAME	= $(basename $(BANNER_ICON))
+
+LDIRT_CLEAN			= $(TARGETS) \
+					  $(BANNER_ICON_NAME).nbfs \
+					  $(BANNER_ICON_NAME).nbfc \
+					  $(BANNER_ICON_NAME).nbfp \
+					  $(TARGETS:.bnr=.srl)
+
+include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
+
+#----------------------------------------------------------------------------
+#  build
+#----------------------------------------------------------------------------
+do-build:		$(TARGETS)
+
+$(TARGETS):		$(BANNER_SPEC) $(BANNER_ICON)
+				$(NTEXCONV) -no -bg -bgb -bgnc $(BANNER_ICON) >/dev/null && \
+				$(MAKEBANNER) -N $(BANNER_ICON_NAME) $(BANNER_SPEC) $(TARGETS)
diff --git a/build/tests/DisplaySystemInformation/banner/banner020A_v3.bsf b/build/tests/DisplaySystemInformation/banner/banner020A_v3.bsf
new file mode 100644
index 00000000..c7a40f7f
Binary files /dev/null and b/build/tests/DisplaySystemInformation/banner/banner020A_v3.bsf differ
diff --git a/build/tests/DisplaySystemInformation/banner/banner021A_v3.bsf b/build/tests/DisplaySystemInformation/banner/banner021A_v3.bsf
new file mode 100644
index 00000000..69f00f12
Binary files /dev/null and b/build/tests/DisplaySystemInformation/banner/banner021A_v3.bsf differ
diff --git a/build/tests/DisplaySystemInformation/banner/banner022A_v3.bsf b/build/tests/DisplaySystemInformation/banner/banner022A_v3.bsf
new file mode 100644
index 00000000..01d4f69c
Binary files /dev/null and b/build/tests/DisplaySystemInformation/banner/banner022A_v3.bsf differ
diff --git a/build/tests/DisplaySystemInformation/banner/banner023A_v3.bsf b/build/tests/DisplaySystemInformation/banner/banner023A_v3.bsf
new file mode 100644
index 00000000..ce71e021
Binary files /dev/null and b/build/tests/DisplaySystemInformation/banner/banner023A_v3.bsf differ
diff --git a/build/tests/DisplaySystemInformation/banner/banner024A_v3.bsf b/build/tests/DisplaySystemInformation/banner/banner024A_v3.bsf
new file mode 100644
index 00000000..74f6562f
Binary files /dev/null and b/build/tests/DisplaySystemInformation/banner/banner024A_v3.bsf differ
diff --git a/build/tests/DisplaySystemInformation/banner/banner025A_v3.bsf b/build/tests/DisplaySystemInformation/banner/banner025A_v3.bsf
new file mode 100644
index 00000000..83d5343d
Binary files /dev/null and b/build/tests/DisplaySystemInformation/banner/banner025A_v3.bsf differ
diff --git a/build/tests/DisplaySystemInformation/banner/banner0B0A_v3.bsf b/build/tests/DisplaySystemInformation/banner/banner0B0A_v3.bsf
new file mode 100644
index 00000000..cb327e33
Binary files /dev/null and b/build/tests/DisplaySystemInformation/banner/banner0B0A_v3.bsf differ
diff --git a/build/tests/DisplaySystemInformation/banner/banner0B1A_v3.bsf b/build/tests/DisplaySystemInformation/banner/banner0B1A_v3.bsf
new file mode 100644
index 00000000..93165d66
Binary files /dev/null and b/build/tests/DisplaySystemInformation/banner/banner0B1A_v3.bsf differ
diff --git a/build/tests/DisplaySystemInformation/banner/banner0B2A_v3.bsf b/build/tests/DisplaySystemInformation/banner/banner0B2A_v3.bsf
new file mode 100644
index 00000000..42fdbd71
Binary files /dev/null and b/build/tests/DisplaySystemInformation/banner/banner0B2A_v3.bsf differ
diff --git a/build/tests/DisplaySystemInformation/banner/banner0B3A_v3.bsf b/build/tests/DisplaySystemInformation/banner/banner0B3A_v3.bsf
new file mode 100644
index 00000000..ce03f18c
Binary files /dev/null and b/build/tests/DisplaySystemInformation/banner/banner0B3A_v3.bsf differ
diff --git a/build/tests/DisplaySystemInformation/banner/banner0B4A_v3.bsf b/build/tests/DisplaySystemInformation/banner/banner0B4A_v3.bsf
new file mode 100644
index 00000000..3a3bf323
Binary files /dev/null and b/build/tests/DisplaySystemInformation/banner/banner0B4A_v3.bsf differ
diff --git a/build/tests/DisplaySystemInformation/banner/banner0B5A_v3.bsf b/build/tests/DisplaySystemInformation/banner/banner0B5A_v3.bsf
new file mode 100644
index 00000000..5a99c642
Binary files /dev/null and b/build/tests/DisplaySystemInformation/banner/banner0B5A_v3.bsf differ
diff --git a/build/tests/DisplaySystemInformation/banner/banner0B6A_v3.bsf b/build/tests/DisplaySystemInformation/banner/banner0B6A_v3.bsf
new file mode 100644
index 00000000..df218cb7
Binary files /dev/null and b/build/tests/DisplaySystemInformation/banner/banner0B6A_v3.bsf differ
diff --git a/build/tests/DisplaySystemInformation/banner/banner0B7A_v3.bsf b/build/tests/DisplaySystemInformation/banner/banner0B7A_v3.bsf
new file mode 100644
index 00000000..73ee7b0e
Binary files /dev/null and b/build/tests/DisplaySystemInformation/banner/banner0B7A_v3.bsf differ
diff --git a/build/tests/DisplaySystemInformation/banner/banner0B8A_v3.bsf b/build/tests/DisplaySystemInformation/banner/banner0B8A_v3.bsf
new file mode 100644
index 00000000..e3f3f29b
Binary files /dev/null and b/build/tests/DisplaySystemInformation/banner/banner0B8A_v3.bsf differ
diff --git a/build/tests/DisplaySystemInformation/banner/banner0B9A_v3.bsf b/build/tests/DisplaySystemInformation/banner/banner0B9A_v3.bsf
new file mode 100644
index 00000000..1082fd89
Binary files /dev/null and b/build/tests/DisplaySystemInformation/banner/banner0B9A_v3.bsf differ
diff --git a/build/tests/DisplaySystemInformation/banner/banner0BAA_v3.bsf b/build/tests/DisplaySystemInformation/banner/banner0BAA_v3.bsf
new file mode 100644
index 00000000..eae1319c
Binary files /dev/null and b/build/tests/DisplaySystemInformation/banner/banner0BAA_v3.bsf differ
diff --git a/build/tests/DisplaySystemInformation/banner/banner0BBA_v3.bsf b/build/tests/DisplaySystemInformation/banner/banner0BBA_v3.bsf
new file mode 100644
index 00000000..e20c3b3b
Binary files /dev/null and b/build/tests/DisplaySystemInformation/banner/banner0BBA_v3.bsf differ
diff --git a/build/tests/DisplaySystemInformation/banner/bannerOption.txt b/build/tests/DisplaySystemInformation/banner/bannerOption.txt
new file mode 100644
index 00000000..9da03c6f
--- /dev/null
+++ b/build/tests/DisplaySystemInformation/banner/bannerOption.txt
@@ -0,0 +1,19 @@
+#gamecode	bannerStr
+0B0A	DisplayInfo_0
+0B1A	DisplayInfo_1
+0B2A	DisplayInfo_2
+0B3A	DisplayInfo_3
+020A	DisplayInfo_4
+021A	DisplayInfo_5
+0B4A	DisplayInfo_6
+0B5A	DisplayInfo_7
+0B6A	DisplayInfo_8
+0B7A	DisplayInfo_9
+0B8A	DisplayInfo_10
+0B9A	DisplayInfo_11
+0BAA	DisplayInfo_12
+0BBA	DisplayInfo_13
+022A	DisplayInfo_14
+023A	DisplayInfo_15
+024A	DisplayInfo_16
+025A	DisplayInfo_17
diff --git a/build/tests/DisplaySystemInformation/banner/icon/020A.bmp b/build/tests/DisplaySystemInformation/banner/icon/020A.bmp
index fb378f20..b6545ca6 100644
Binary files a/build/tests/DisplaySystemInformation/banner/icon/020A.bmp and b/build/tests/DisplaySystemInformation/banner/icon/020A.bmp differ
diff --git a/build/tests/DisplaySystemInformation/banner/icon/021A.bmp b/build/tests/DisplaySystemInformation/banner/icon/021A.bmp
index 938d0b66..142af23d 100644
Binary files a/build/tests/DisplaySystemInformation/banner/icon/021A.bmp and b/build/tests/DisplaySystemInformation/banner/icon/021A.bmp differ
diff --git a/build/tests/DisplaySystemInformation/banner/icon/022A.bmp b/build/tests/DisplaySystemInformation/banner/icon/022A.bmp
index 180aaf1e..6a9ad050 100644
Binary files a/build/tests/DisplaySystemInformation/banner/icon/022A.bmp and b/build/tests/DisplaySystemInformation/banner/icon/022A.bmp differ
diff --git a/build/tests/DisplaySystemInformation/banner/icon/023A.bmp b/build/tests/DisplaySystemInformation/banner/icon/023A.bmp
index ccb3fb62..33ed807f 100644
Binary files a/build/tests/DisplaySystemInformation/banner/icon/023A.bmp and b/build/tests/DisplaySystemInformation/banner/icon/023A.bmp differ
diff --git a/build/tests/DisplaySystemInformation/banner/icon/024A.bmp b/build/tests/DisplaySystemInformation/banner/icon/024A.bmp
index 16d9f8a1..7b135f8b 100644
Binary files a/build/tests/DisplaySystemInformation/banner/icon/024A.bmp and b/build/tests/DisplaySystemInformation/banner/icon/024A.bmp differ
diff --git a/build/tests/DisplaySystemInformation/banner/icon/025A.bmp b/build/tests/DisplaySystemInformation/banner/icon/025A.bmp
index e9d09a1c..3e036a6d 100644
Binary files a/build/tests/DisplaySystemInformation/banner/icon/025A.bmp and b/build/tests/DisplaySystemInformation/banner/icon/025A.bmp differ