diff --git a/Makefile.ctr b/Makefile.ctr
index 460fbac86a..dd093ffe04 100644
--- a/Makefile.ctr
+++ b/Makefile.ctr
@@ -3,7 +3,9 @@ LIBRETRO =
 
 DEBUG = 0
 GRIFFIN_BUILD = 1
-
+WHOLE_ARCHIVE_LINK = 0
+BUILD_3DSX = 1
+BUILD_CIA  = 1
 
 APP_TITLE         = Retroarch 3DS
 APP_DESCRIPTION   = Retroarch 3DS
@@ -256,6 +258,12 @@ ifeq ($(DEBUG), 1)
 else
    CFLAGS	+= -O3
 endif
+
+ifeq ($(WHOLE_ARCHIVE_LINK), 1)
+   WHOLE_START := -Wl,--whole-archive
+   WHOLE_END := -Wl,--no-whole-archive
+endif
+
 CFLAGS += -I. -Ideps/zlib -Ideps/7zip -Ilibretro-common/include
 
 CFLAGS += -DRARCH_INTERNAL -DRARCH_CONSOLE -DSINC_LOWEST_QUALITY
@@ -272,15 +280,22 @@ LDFLAGS   =	-specs=3dsx.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
 CFLAGS   += -std=gnu99 -ffast-math
 
 
-LIBS	:= -lretro_ctr -lctru -lm
+LIBS	:= $(WHOLE_START) -lretro_ctr $(WHOLE_END) -lctru -lm
 
 
+ifeq ($(BUILD_3DSX), 1)
+TARGET_3DSX := $(TARGET).3dsx $(TARGET).smdh
+endif
+
+ifeq ($(BUILD_CIA), 1)
+TARGET_CIA := $(TARGET).cia
+else
 
 .PHONY: $(BUILD) clean all
 
 all: $(TARGET)
 
-$(TARGET): $(TARGET).3dsx $(TARGET).smdh $(TARGET).cia
+$(TARGET): $(TARGET_3DSX) $(TARGET_CIA)
 $(TARGET).3dsx: $(TARGET).elf
 $(TARGET).elf: $(OBJS) libretro_ctr.a
 
diff --git a/ctr/2048.png b/ctr/2048.png
new file mode 100644
index 0000000000..d0e98e66dc
Binary files /dev/null and b/ctr/2048.png differ
diff --git a/ctr/Makefile.cores b/ctr/Makefile.cores
index 363f251536..b973716d2b 100644
--- a/ctr/Makefile.cores
+++ b/ctr/Makefile.cores
@@ -39,6 +39,7 @@ else ifeq ($(LIBRETRO), nestopia)
 	APP_ICON          = ctr/nestopia.png
 	#APP_BANNER        = ctr/libretro_banner.png
 	#APP_AUDIO         = ctr/silent.wav
+	BUILD_3DSX        = 0
 
 else ifeq ($(LIBRETRO), nxengine)
 	APP_TITLE         = NXengine Libretro
@@ -56,7 +57,7 @@ else ifeq ($(LIBRETRO), genesis_plus_gx)
 	#APP_AUTHOR        = Team Libretro
 	APP_PRODUCT_CODE  = RARCH-GENPLUSGX
 	APP_UNIQUE_ID     = 0xBAC06
-	APP_ICON          = ctr/gambatte.png
+	APP_ICON          = ctr/genesis_plus_gx.png
 	#APP_BANNER        = ctr/libretro_banner.png
 	#APP_AUDIO         = ctr/silent.wav
 
@@ -66,7 +67,67 @@ else ifeq ($(LIBRETRO), catsfc)
 	#APP_AUTHOR        = Team Libretro
 	APP_PRODUCT_CODE  = RARCH-CATSFC
 	APP_UNIQUE_ID     = 0xBAC07
-	APP_ICON          = ctr/gambatte.png
+	APP_ICON          = ctr/catsfc.png
+	#APP_BANNER        = ctr/libretro_banner.png
+	#APP_AUDIO         = ctr/silent.wav
+
+else ifeq ($(LIBRETRO), mednafen_wswan)
+	APP_TITLE         = Mednafen wswan Libretro
+	#APP_DESCRIPTION   = Retroarch 3DS
+	#APP_AUTHOR        = Team Libretro
+	APP_PRODUCT_CODE  = RARCH-M-WSWAN
+	APP_UNIQUE_ID     = 0xBAC08
+	APP_ICON          = ctr/mednafen_wswan.png
+	#APP_BANNER        = ctr/libretro_banner.png
+	#APP_AUDIO         = ctr/silent.wav
+
+else ifeq ($(LIBRETRO), mednafen_vb)
+	APP_TITLE         = Mednafen VB Libretro
+	#APP_DESCRIPTION   = Retroarch 3DS
+	#APP_AUTHOR        = Team Libretro
+	APP_PRODUCT_CODE  = RARCH-M-VB
+	APP_UNIQUE_ID     = 0xBAC09
+	APP_ICON          = ctr/mednafen_vb.png
+	#APP_BANNER        = ctr/libretro_banner.png
+	#APP_AUDIO         = ctr/silent.wav
+
+else ifeq ($(LIBRETRO), mednafen_ngp)
+	APP_TITLE         = Mednafen NGP Libretro
+	#APP_DESCRIPTION   = Retroarch 3DS
+	#APP_AUTHOR        = Team Libretro
+	APP_PRODUCT_CODE  = RARCH-M-NGP
+	APP_UNIQUE_ID     = 0xBAC0A
+	APP_ICON          = ctr/mednafen_ngp.png
+	#APP_BANNER        = ctr/libretro_banner.png
+	#APP_AUDIO         = ctr/silent.wav
+
+else ifeq ($(LIBRETRO), 2048)
+	APP_TITLE         = 2048 Libretro
+	#APP_DESCRIPTION   = Retroarch 3DS
+	#APP_AUTHOR        = Team Libretro
+	APP_PRODUCT_CODE  = RARCH-2048
+	APP_UNIQUE_ID     = 0xBAC0B
+	APP_ICON          = ctr/2048.png
+	#APP_BANNER        = ctr/libretro_banner.png
+	#APP_AUDIO         = ctr/silent.wav
+
+else ifeq ($(LIBRETRO), picodrive)
+	APP_TITLE         = Picodrive Libretro
+	#APP_DESCRIPTION   = Retroarch 3DS
+	#APP_AUTHOR        = Team Libretro
+	APP_PRODUCT_CODE  = RARCH-PICODRIVE
+	APP_UNIQUE_ID     = 0xBAC0C
+	APP_ICON          = ctr/picodrive.png
+	#APP_BANNER        = ctr/libretro_banner.png
+	#APP_AUDIO         = ctr/silent.wav
+
+else ifeq ($(LIBRETRO), snes9x_next)
+	APP_TITLE         = Snes9x Next Libretro
+	#APP_DESCRIPTION   = Retroarch 3DS
+	#APP_AUTHOR        = Team Libretro
+	APP_PRODUCT_CODE  = RARCH-SNES9XNEXT
+	APP_UNIQUE_ID     = 0xBAC0D
+	APP_ICON          = ctr/snes9x_next.png
 	#APP_BANNER        = ctr/libretro_banner.png
 	#APP_AUDIO         = ctr/silent.wav
 
diff --git a/ctr/mednafen_ngp.png b/ctr/mednafen_ngp.png
new file mode 100644
index 0000000000..d0e98e66dc
Binary files /dev/null and b/ctr/mednafen_ngp.png differ
diff --git a/ctr/mednafen_vb.png b/ctr/mednafen_vb.png
new file mode 100644
index 0000000000..d0e98e66dc
Binary files /dev/null and b/ctr/mednafen_vb.png differ
diff --git a/ctr/mednafen_wswan.png b/ctr/mednafen_wswan.png
new file mode 100644
index 0000000000..d0e98e66dc
Binary files /dev/null and b/ctr/mednafen_wswan.png differ
diff --git a/ctr/picodrive.png b/ctr/picodrive.png
new file mode 100644
index 0000000000..d0e98e66dc
Binary files /dev/null and b/ctr/picodrive.png differ
diff --git a/ctr/snes9x_next.png b/ctr/snes9x_next.png
new file mode 100644
index 0000000000..d0e98e66dc
Binary files /dev/null and b/ctr/snes9x_next.png differ