diff --git a/Makefile.ctr b/Makefile.ctr
index 256c3919a2..16dbcb0100 100644
--- a/Makefile.ctr
+++ b/Makefile.ctr
@@ -1,11 +1,12 @@
 TARGET := retroarch_3ds
 LIBRETRO =
 
-DEBUG = 0
-GRIFFIN_BUILD = 1
+DEBUG              = 0
+GRIFFIN_BUILD      = 1
 WHOLE_ARCHIVE_LINK = 0
-BUILD_3DSX = 1
-BUILD_CIA  = 1
+BIG_STACK          = 0
+BUILD_3DSX         = 1
+BUILD_CIA          = 1
 
 APP_TITLE         = Retroarch 3DS
 APP_DESCRIPTION   = Retroarch 3DS
@@ -19,7 +20,11 @@ APP_CIA_RSF       = ctr/tools/template-cia.rsf
 APP_3DS_RSF       = ctr/tools/template-3ds.rsf
 
 
+ifeq ($(BIG_STACK),1)
+CTR_STACK_SIZE        = 0x400000
+else
 CTR_STACK_SIZE        = 0x100000
+endif
 CTR_LINEAR_HEAP_SIZE  = 0x600000
 
 include ctr/Makefile.cores
@@ -45,11 +50,10 @@ else
 	OBJS += gfx/drivers_context/gfx_null_ctx.o
 	OBJS += gfx/image/image.o
 	OBJS += gfx/video_texture.o
-	OBJS += libretro-common/formats/tga/tga_decode.o
-	OBJS += libretro-common/formats/png/rpng_fbio.o
-	OBJS += libretro-common/formats/png/rpng_nbio.o
-	OBJS += libretro-common/formats/png/rpng_decode.o
+	OBJS += libretro-common/formats/tga/rtga.o
+	OBJS += libretro-common/formats/png/rpng.o
 	OBJS += libretro-common/formats/png/rpng_encode.o
+	OBJS += libretro-common/formats/bmp/rbmp_encode.o
 	OBJS += gfx/drivers/ctr_gfx.o
 	OBJS += gfx/drivers/nullgfx.o
 	OBJS += gfx/font_renderer_driver.o
@@ -123,6 +127,7 @@ else
 	OBJS += file_path_special.o
 	OBJS += libretro-common/file/dir_list.o
 	OBJS += libretro-common/file/retro_dirent.o
+	OBJS += libretro-common/file/retro_file.o
 	OBJS += dir_list_special.o
 	OBJS += libretro-common/string/string_list.o
 	OBJS += libretro-common/string/stdstring.o
diff --git a/ctr/Makefile.cores b/ctr/Makefile.cores
index d0f78a8530..fee4bf0caa 100644
--- a/ctr/Makefile.cores
+++ b/ctr/Makefile.cores
@@ -181,4 +181,35 @@ else ifeq ($(LIBRETRO), fb_alpha_cps2)
 	#APP_BANNER        = ctr/libretro_banner.png
 	#APP_AUDIO         = ctr/silent.wav
 
+else ifeq ($(LIBRETRO), catsfc_plus)
+	APP_TITLE         = CATSFC Plus Libretro
+	#APP_DESCRIPTION   = Retroarch 3DS
+	#APP_AUTHOR        = Team Libretro
+	APP_PRODUCT_CODE  = RARCH-CATSFCPLUS
+	APP_UNIQUE_ID     = 0xBAC13
+	APP_ICON          = ctr/catsfc_plus.png
+	#APP_BANNER        = ctr/libretro_banner.png
+	#APP_AUDIO         = ctr/silent.wav
+
+else ifeq ($(LIBRETRO), mednafen_pce_fast)
+	APP_TITLE         = Mednafen/Beetle PCE FAST
+	#APP_DESCRIPTION   = Retroarch 3DS
+	APP_AUTHOR        = Ryphecha
+	APP_PRODUCT_CODE  = RARCH-M-PCE-FAST
+	APP_UNIQUE_ID     = 0xBAC14
+	APP_ICON          = ctr/mednafen_pce_fast.png
+	#APP_BANNER        = ctr/libretro_banner.png
+	#APP_AUDIO         = ctr/silent.wav
+
+else ifeq ($(LIBRETRO), pcsx_rearmed)
+	APP_TITLE         = PCSX ReARMed
+	#APP_DESCRIPTION   = Retroarch 3DS
+	APP_AUTHOR        = PCSX Team, notaz, Exophase
+	APP_PRODUCT_CODE  = RARCH-PCSXRARMD
+	APP_UNIQUE_ID     = 0xBAC15
+	APP_ICON          = ctr/pcsx_rearmed.png
+	#APP_BANNER        = ctr/libretro_banner.png
+	#APP_AUDIO         = ctr/silent.wav
+	BUILD_3DSX        = 0
+
 endif
diff --git a/ctr/catsfc_plus.png b/ctr/catsfc_plus.png
new file mode 100644
index 0000000000..071967f690
Binary files /dev/null and b/ctr/catsfc_plus.png differ
diff --git a/ctr/mednafen_pce_fast.png b/ctr/mednafen_pce_fast.png
new file mode 100644
index 0000000000..eac6426613
Binary files /dev/null and b/ctr/mednafen_pce_fast.png differ
diff --git a/ctr/pcsx_rearmed.png b/ctr/pcsx_rearmed.png
new file mode 100644
index 0000000000..7333804dfb
Binary files /dev/null and b/ctr/pcsx_rearmed.png differ