diff --git a/build/systemMenu_RED/DSHashTable/Makefile b/build/systemMenu_RED/DSHashTable/Makefile
index f2c2fcc5..6b7829ee 100644
--- a/build/systemMenu_RED/DSHashTable/Makefile
+++ b/build/systemMenu_RED/DSHashTable/Makefile
@@ -50,7 +50,7 @@ INSTALL_TARGETS		=	$(MY_TAD)
 INSTALL_DIR		=	$(ROOT)/build/tools/TwlNMenu/data
 
 MAKETAD_FLAGS		=	-d $(MY_TITLE_ID) $(MY_GROUP_ID) $(MY_MAJOR_VERSION) $(MY_TITLE_NAME) \
-				-v $(MY_MINOR_VERSION)
+				-v $(MY_MINOR_VERSION) -p
 
 LDIRT_CLEAN		=	$(MY_TAD)
 
diff --git a/build/systemMenu_RED/Launcher/ARM9/Makefile b/build/systemMenu_RED/Launcher/ARM9/Makefile
index 7e433f78..606d318b 100644
--- a/build/systemMenu_RED/Launcher/ARM9/Makefile
+++ b/build/systemMenu_RED/Launcher/ARM9/Makefile
@@ -64,9 +64,7 @@ CARD_REGION				=	ALL
 ##################################################################
 
 
-TARGET_TAD				=	$(BINDIR)/$(TITLEID_LO).$(TWL_BUILD_DIR)$(CODEGEN_ARCH).tad
-
-TARGET_BIN				=	main.srl
+TARGET_BIN				=	$(TITLEID_LO).tad
 
 LCFILE_SPEC				=	ARM9-TS.lsf
 LCFILE_TEMPLATE			=	ARM9-TS.lcf.template
@@ -110,7 +108,7 @@ MAKEROM_FLAGS			+=	-F \
 							-DCARD_REGION='$(CARD_REGION)' \
 							-DDISABLE_DEBUG='$(DISABLE_DEBUG)'
 
-MAKETAD_FLAGS			+= -s
+MAKETAD_OPTION			+= -s
 
 ifeq ($(DO_NOT_SHOW_LAUNCHER),TRUE)
 MACRO_FLAGS += -DDO_NOT_SHOW_LAUNCHER
@@ -153,8 +151,7 @@ GLIBRARIES		:= $(filter-out libsharedfont$(TWL_LIBSUFFIX).a,$(GLIBRARIES))
 
 MAKEROM			 = $(SYSMENU_TOOLSDIR)/bin/makerom.TWL.launcher.exe
 
-LDIRT_CLEAN				=	$(TARGET_TAD)
-INSTALL_TARGETS			=	$(TARGET_TAD)
+INSTALL_TARGETS			=	$(BINDIR)/$(TARGET_BIN)
 INSTALL_DIR				=	$(SDK_NMENU_DATADIR)
 
 #----------------------------------------------------------------------------
diff --git a/build/systemMenu_RED/MachineSettings/ARM9/Makefile b/build/systemMenu_RED/MachineSettings/ARM9/Makefile
index e75f7580..ed41e1fe 100644
--- a/build/systemMenu_RED/MachineSettings/ARM9/Makefile
+++ b/build/systemMenu_RED/MachineSettings/ARM9/Makefile
@@ -42,9 +42,7 @@ TITLEID_LO				=	HNBA
 CARD_REGION				=	ALL
 ##################################################################
 
-TARGET_TAD				=	$(BINDIR)/$(TITLEID_LO).$(TWL_BUILD_DIR)$(CODEGEN_ARCH).tad
-
-TARGET_BIN				=	main.srl
+TARGET_BIN				=	$(TITLEID_LO).tad
 
 ROM_SPEC				=	main.rsf
 
@@ -66,7 +64,7 @@ MAKEROM_FLAGS			+=	-DTITLEID_LO='$(TITLEID_LO)' \
 							-DCARD_REGION='$(CARD_REGION)' \
 							-DDISABLE_DEBUG='$(DISABLE_DEBUG)'
 
-MAKETAD_FLAGS			+= -s
+MAKETAD_OPTION			+= -s
 
 LLIBRARIES				=	libes$(TWL_LIBSUFFIX).a				\
 							libboc$(TWL_LIBSUFFIX).a			\
@@ -94,8 +92,7 @@ MAKEROM_ARM7_BASE		=	$(TWL_COMPONENTSDIR)/armadillo/$(TWL_BUILDTYPE_ARM7)/armadi
 MAKEROM_ARM7			=	$(MAKEROM_ARM7_BASE).$(TWL_ELF_EXT)
 MAKEROM					=	$(TWL_TOOLSDIR)/bin/makerom.TWL.secure.exe
 
-LDIRT_CLEAN				=	$(TARGET_TAD)
-INSTALL_TARGETS			=	$(TARGET_TAD)
+INSTALL_TARGETS			=	$(BINDIR)/$(TARGET_BIN)
 INSTALL_DIR				=	$(SDK_NMENU_DATADIR)
 
 #----------------------------------------------------------------------------
diff --git a/build/systemMenu_RED/PictoChat/ARM9/Makefile b/build/systemMenu_RED/PictoChat/ARM9/Makefile
index f7c07a28..b5e3ff14 100644
--- a/build/systemMenu_RED/PictoChat/ARM9/Makefile
+++ b/build/systemMenu_RED/PictoChat/ARM9/Makefile
@@ -25,9 +25,8 @@ TARGET_PLATFORM			=	TWL
 TWL_ARCHGEN				=	LIMITED
 
 TITLEID_LO				=	HNEA
-TARGET_TAD				=	$(BINDIR)/$(TITLEID_LO).$(TWL_BUILD_DIR)$(CODEGEN_ARCH).tad
 
-TARGET_BIN				=	main.srl
+TARGET_BIN				=	$(TITLEID_LO).tad
 
 ROM_SPEC				=	main.rsf
 
@@ -39,7 +38,7 @@ SRCS					=	main.c PictoChat.c \
 LINCLUDES				=	$(MISC_DIR)/include
 
 MAKEROM_FLAGS			+=	-DTITLEID_LO='$(TITLEID_LO)'
-MAKETAD_FLAGS			+= -s
+MAKETAD_OPTION			+= -s
 
 include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
 
@@ -49,8 +48,7 @@ endif
 
 MAKEROM			 = $(TWL_TOOLSDIR)/bin/makerom.TWL.sys.exe
 
-LDIRT_CLEAN				=	$(TARGET_TAD)
-INSTALL_TARGETS			=	$(TARGET_TAD)
+INSTALL_TARGETS			=	$(BINDIR)/$(TARGET_BIN)
 INSTALL_DIR				=	$(SDK_NMENU_DATADIR)
 
 #----------------------------------------------------------------------------
diff --git a/build/systemMenu_RED/wlanfirm/Makefile b/build/systemMenu_RED/wlanfirm/Makefile
index 9b706a3c..0a46ca5a 100644
--- a/build/systemMenu_RED/wlanfirm/Makefile
+++ b/build/systemMenu_RED/wlanfirm/Makefile
@@ -31,7 +31,7 @@ MY_FIRM_ROOT_CYG =	$(call eupath,$(MY_FIRM_ROOT))
 MY_TITLE		=	HNCA
 MY_FIRM			=	$(MY_FIRM_ROOT_CYG)/nwm_firm.bin
 
-MAKETAD_FLAGS	+=	0003000F484E4341 3031 0 WIRELESS_FW
+MAKETAD_FLAGS	+=	0003000F484E4341 3031 0 WIRELESS_FW -p
 
 #----------------------------------------------------------------------------
 MY_TAD			=	$(MY_TITLE).tad