diff --git a/Makefile.ctr b/Makefile.ctr
index 7b20d89b29..f2e2bad21f 100644
--- a/Makefile.ctr
+++ b/Makefile.ctr
@@ -15,6 +15,8 @@ APP_UNIQUE_ID     = 0xBAC00
 APP_ICON          = ctr/default.png
 APP_BANNER        = ctr/libretro_banner.png
 APP_AUDIO         = ctr/silent.wav
+APP_CIA_RSF       = ctr/tools/template-cia.rsf
+APP_3DS_RSF       = ctr/tools/template-3ds.rsf
 
 include ctr/Makefile.cores
 
@@ -369,15 +371,12 @@ $(TARGET).bnr: $(APP_BANNER) $(APP_AUDIO)
 $(TARGET).icn: $(APP_ICON)
 	$(BANNERTOOL) makesmdh -s "$(APP_TITLE)" -l "$(APP_TITLE)" -p "$(APP_AUTHOR)" -i $(APP_ICON) -o $@
 
-$(TARGET).rsf: ctr/tools/template-cia.rsf
-	cat ctr/tools/template-cia.rsf | sed 's/{APP_TITLE}/$(APP_TITLE)/' | sed 's/{APP_PRODUCT_CODE}/$(APP_PRODUCT_CODE)/' | sed 's/{APP_UNIQUE_ID}/$(APP_UNIQUE_ID)/' > $@
-
 $(TARGET)_stripped.elf: $(TARGET).elf
 	cp $(TARGET).elf $@
 	$(STRIP) $@
 
-$(TARGET).cia: $(TARGET)_stripped.elf $(TARGET).bnr $(TARGET).icn $(TARGET).rsf
-	$(MAKEROM) -f cia -o $@ -rsf $(TARGET).rsf -target t -exefslogo -elf $(TARGET)_stripped.elf -icon $(TARGET).icn -banner $(TARGET).bnr
+$(TARGET).cia: $(TARGET)_stripped.elf $(TARGET).bnr $(TARGET).icn
+	$(MAKEROM) -f cia -o $@ -rsf $(APP_CIA_RSF) -target t -exefslogo -elf $(TARGET)_stripped.elf -icon $(TARGET).icn -banner $(TARGET).bnr -DAPP_TITLE=$(APP_TITLE) -DAPP_PRODUCT_CODE=$(APP_PRODUCT_CODE) -DAPP_UNIQUE_ID=$(APP_UNIQUE_ID)
 
 clean:
 	rm -f $(OBJS)
@@ -387,7 +386,6 @@ clean:
 	rm -f $(TARGET).cia
 	rm -f $(TARGET).bnr
 	rm -f $(TARGET).icn
-	rm -f $(TARGET).rsf
 	rm -f *_shader_shbin.h
 
 .PHONY: clean
diff --git a/ctr/tools/template-3ds.rsf b/ctr/tools/template-3ds.rsf
index daae50c076..18a5f1feed 100644
--- a/ctr/tools/template-3ds.rsf
+++ b/ctr/tools/template-3ds.rsf
@@ -1,7 +1,7 @@
 BasicInfo:
-  Title                   : "{APP_TITLE}"
+  Title                   : "$(APP_TITLE)"
   CompanyCode             : "00"
-  ProductCode             : "{APP_PRODUCT_CODE}"
+  ProductCode             : "$(APP_PRODUCT_CODE)"
   ContentType             : Application
   Logo                    : Nintendo # Nintendo / Licensed / Distributed / iQue / iQueForSystem
 
@@ -9,9 +9,8 @@ BasicInfo:
   # Specifies the root path of the file system to include in the ROM.
   # HostRoot                : "romfs"
 
-
 TitleInfo:
-  UniqueId                : {APP_UNIQUE_ID}
+  UniqueId                : $(APP_UNIQUE_ID)
   Category                : Application
   
 CardInfo:
diff --git a/ctr/tools/template-cia.rsf b/ctr/tools/template-cia.rsf
index 441183ce5c..bfe87699ea 100644
--- a/ctr/tools/template-cia.rsf
+++ b/ctr/tools/template-cia.rsf
@@ -1,7 +1,7 @@
 BasicInfo:
-  Title                   : "{APP_TITLE}"
+  Title                   : "$(APP_TITLE)"
   CompanyCode             : "00"
-  ProductCode             : "{APP_PRODUCT_CODE}"
+  ProductCode             : "$(APP_PRODUCT_CODE)"
   ContentType             : Application
   Logo                    : Nintendo # Nintendo / Licensed / Distributed / iQue / iQueForSystem
 
@@ -10,7 +10,7 @@ BasicInfo:
   # HostRoot                : "romfs"
 
 TitleInfo:
-  UniqueId                : {APP_UNIQUE_ID}
+  UniqueId                : $(APP_UNIQUE_ID)
   Category                : Application
 
 CardInfo: