diff --git a/Makefile.ctr b/Makefile.ctr
index 56fd2a5e27..21eb4fc87e 100644
--- a/Makefile.ctr
+++ b/Makefile.ctr
@@ -14,9 +14,9 @@ APP_DESCRIPTION      = Retroarch 3DS
 APP_AUTHOR           = Team Libretro
 APP_PRODUCT_CODE     = RETROARCH-3DS
 APP_UNIQUE_ID        = 0xBAC00
-APP_ICON             = ctr/default.png
-APP_BANNER           = ctr/libretro_banner.png
-APP_AUDIO            = ctr/silent.wav
+APP_ICON             = ctr/assets/default.png
+APP_BANNER           = ctr/assets/libretro_banner.png
+APP_AUDIO            = ctr/assets/silent.wav
 APP_RSF              = ctr/tools/template.rsf
 APP_SYSTEM_MODE      = 64MB
 APP_SYSTEM_MODE_EXT  = 124MB
@@ -35,6 +35,7 @@ ifeq ($(GRIFFIN_BUILD), 1)
 	OBJS += griffin/griffin.o
 else
 	OBJS += libretro-common/file/file_extract.o
+	OBJS += verbosity.o
 	OBJS += performance.o
 	OBJS += libretro-common/compat/compat_getopt.o
 	OBJS += libretro-common/compat/compat_strcasestr.o
@@ -90,8 +91,6 @@ else
 	OBJS += audio/drivers/nullaudio.o
 	OBJS += gfx/video_driver.o
 	OBJS += gfx/video_common.o
-	OBJS += gfx/video_pixel_converter.o
-	OBJS += gfx/video_viewport.o
 	OBJS += input/input_driver.o
 	OBJS += audio/audio_driver.o
 	OBJS += camera/camera_driver.o
@@ -157,6 +156,7 @@ else
 	OBJS += runloop_data.o
 	OBJS += runloop_msg.o
 	OBJS += system.o
+	OBJS += tasks/tasks.o
 	OBJS += msg_hash.o
 	OBJS += intl/msg_hash_de.o
 	OBJS += intl/msg_hash_es.o
diff --git a/audio/drivers/ctr_csnd_audio.c b/audio/drivers/ctr_csnd_audio.c
index 0a5981be5b..624fc16843 100644
--- a/audio/drivers/ctr_csnd_audio.c
+++ b/audio/drivers/ctr_csnd_audio.c
@@ -14,10 +14,12 @@
  */
 
 #include <3ds.h>
+#include <string.h>
 
 #include "../audio_driver.h"
 #include "../../configuration.h"
 #include "../../performance.h"
+#include "../../system.h"
 
 typedef struct
 {
@@ -70,8 +72,8 @@ Result csndPlaySound_custom(int chn, u32 flags, float vol, float pan, void* data
 
 	if (encoding != CSND_ENCODING_PSG)
 	{
-		if (data0) paddr0 = osConvertVirtToPhys((u32)data0);
-		if (data1) paddr1 = osConvertVirtToPhys((u32)data1);
+		if (data0) paddr0 = osConvertVirtToPhys(data0);
+		if (data1) paddr1 = osConvertVirtToPhys(data1);
 
 		if (data0 && encoding == CSND_ENCODING_ADPCM)
 		{
@@ -117,8 +119,8 @@ static void *ctr_csnd_audio_init(const char *device, unsigned rate, unsigned lat
    memset(ctr->l, 0, CTR_CSND_AUDIO_SIZE);
    memset(ctr->r, 0, CTR_CSND_AUDIO_SIZE);
 
-   ctr->l_paddr              = osConvertVirtToPhys((u32)ctr->l);
-   ctr->r_paddr              = osConvertVirtToPhys((u32)ctr->r);
+   ctr->l_paddr              = osConvertVirtToPhys(ctr->l);
+   ctr->r_paddr              = osConvertVirtToPhys(ctr->r);
 
    ctr->pos                  = 0;
 
diff --git a/audio/drivers/ctr_dsp_audio.c b/audio/drivers/ctr_dsp_audio.c
index ab6d167ccb..762dd271f4 100644
--- a/audio/drivers/ctr_dsp_audio.c
+++ b/audio/drivers/ctr_dsp_audio.c
@@ -14,10 +14,12 @@
  */
 
 #include <3ds.h>
+#include <string.h>
 
 #include "../audio_driver.h"
 #include "../../configuration.h"
 #include "../../performance.h"
+#include "../../system.h"
 #include "../../ctr/ctr_debug.h"
 
 typedef struct
diff --git a/ctr/Makefile.cores b/ctr/Makefile.cores
index 95f5105c47..c8ead8fb16 100644
--- a/ctr/Makefile.cores
+++ b/ctr/Makefile.cores
@@ -6,9 +6,9 @@ ifeq ($(LIBRETRO), gambatte)
 	#APP_AUTHOR          = Team Libretro
 	APP_PRODUCT_CODE    = RARCH-GAMBATTE
 	APP_UNIQUE_ID       = 0xBAC01
-	APP_ICON            = ctr/gambatte.png
-	#APP_BANNER          = ctr/libretro_banner.png
-	#APP_AUDIO           = ctr/silent.wav
+	APP_ICON            = ctr/assets/gambatte.png
+	#APP_BANNER          = ctr/assets/libretro_banner.png
+	#APP_AUDIO           = ctr/assets/silent.wav
 
 else ifeq ($(LIBRETRO), gpsp)
 	APP_TITLE           = gpSP Libretro
@@ -16,9 +16,9 @@ else ifeq ($(LIBRETRO), gpsp)
 	#APP_AUTHOR          = Team Libretro
 	APP_PRODUCT_CODE    = RARCH-GPSP
 	APP_UNIQUE_ID       = 0xBAC02
-	APP_ICON            = ctr/gpsp.png
-	#APP_BANNER          = ctr/libretro_banner.png
-	#APP_AUDIO           = ctr/silent.wav
+	APP_ICON            = ctr/assets/gpsp.png
+	#APP_BANNER          = ctr/assets/libretro_banner.png
+	#APP_AUDIO           = ctr/assets/silent.wav
 
 else ifeq ($(LIBRETRO), fceumm)
 	APP_TITLE           = FCeumm Libretro
@@ -26,9 +26,9 @@ else ifeq ($(LIBRETRO), fceumm)
 	#APP_AUTHOR          = Team Libretro
 	APP_PRODUCT_CODE    = RARCH-FCEUMM
 	APP_UNIQUE_ID       = 0xBAC03
-	APP_ICON            = ctr/fceumm.png
-	#APP_BANNER          = ctr/libretro_banner.png
-	#APP_AUDIO           = ctr/silent.wav
+	APP_ICON            = ctr/assets/fceumm.png
+	#APP_BANNER          = ctr/assets/libretro_banner.png
+	#APP_AUDIO           = ctr/assets/silent.wav
 
 else ifeq ($(LIBRETRO), nestopia)
 	APP_TITLE           = Nestopia Libretro
@@ -36,9 +36,9 @@ else ifeq ($(LIBRETRO), nestopia)
 	#APP_AUTHOR          = Team Libretro
 	APP_PRODUCT_CODE    = RARCH-NESTOPIA
 	APP_UNIQUE_ID       = 0xBAC04
-	APP_ICON            = ctr/nestopia.png
-	#APP_BANNER          = ctr/libretro_banner.png
-	#APP_AUDIO           = ctr/silent.wav
+	APP_ICON            = ctr/assets/nestopia.png
+	#APP_BANNER          = ctr/assets/libretro_banner.png
+	#APP_AUDIO           = ctr/assets/silent.wav
 
 else ifeq ($(LIBRETRO), nxengine)
 	APP_TITLE           = NXengine Libretro
@@ -46,9 +46,9 @@ else ifeq ($(LIBRETRO), nxengine)
 	#APP_AUTHOR          = Team Libretro
 	APP_PRODUCT_CODE    = RARCH-NXENGINE
 	APP_UNIQUE_ID       = 0xBAC05
-	APP_ICON            = ctr/nxengine.png
-	#APP_BANNER          = ctr/libretro_banner.png
-	#APP_AUDIO           = ctr/silent.wav
+	APP_ICON            = ctr/assets/nxengine.png
+	#APP_BANNER          = ctr/assets/libretro_banner.png
+	#APP_AUDIO           = ctr/assets/silent.wav
 
 else ifeq ($(LIBRETRO), genesis_plus_gx)
 	APP_TITLE           = Genesis Plus GX Libretro
@@ -56,9 +56,9 @@ else ifeq ($(LIBRETRO), genesis_plus_gx)
 	#APP_AUTHOR          = Team Libretro
 	APP_PRODUCT_CODE    = RARCH-GENPLUSGX
 	APP_UNIQUE_ID       = 0xBAC06
-	APP_ICON            = ctr/genesis_plus_gx.png
-	#APP_BANNER          = ctr/libretro_banner.png
-	#APP_AUDIO           = ctr/silent.wav
+	APP_ICON            = ctr/assets/genesis_plus_gx.png
+	#APP_BANNER          = ctr/assets/libretro_banner.png
+	#APP_AUDIO           = ctr/assets/silent.wav
 
 else ifeq ($(LIBRETRO), catsfc)
 	APP_TITLE           = CATSFC Libretro
@@ -66,9 +66,9 @@ else ifeq ($(LIBRETRO), catsfc)
 	#APP_AUTHOR          = Team Libretro
 	APP_PRODUCT_CODE    = RARCH-CATSFC
 	APP_UNIQUE_ID       = 0xBAC07
-	APP_ICON            = ctr/catsfc.png
-	#APP_BANNER          = ctr/libretro_banner.png
-	#APP_AUDIO           = ctr/silent.wav
+	APP_ICON            = ctr/assets/catsfc.png
+	#APP_BANNER          = ctr/assets/libretro_banner.png
+	#APP_AUDIO           = ctr/assets/silent.wav
 
 else ifeq ($(LIBRETRO), mednafen_wswan)
 	APP_TITLE           = Mednafen wswan Libretro
@@ -76,9 +76,9 @@ else ifeq ($(LIBRETRO), mednafen_wswan)
 	#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
+	APP_ICON            = ctr/assets/mednafen_wswan.png
+	#APP_BANNER          = ctr/assets/libretro_banner.png
+	#APP_AUDIO           = ctr/assets/silent.wav
 
 else ifeq ($(LIBRETRO), mednafen_vb)
 	APP_TITLE           = Mednafen VB Libretro
@@ -86,9 +86,9 @@ else ifeq ($(LIBRETRO), mednafen_vb)
 	#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
+	APP_ICON            = ctr/assets/mednafen_vb.png
+	#APP_BANNER          = ctr/assets/libretro_banner.png
+	#APP_AUDIO           = ctr/assets/silent.wav
 
 else ifeq ($(LIBRETRO), mednafen_ngp)
 	APP_TITLE           = Mednafen NGP Libretro
@@ -96,9 +96,9 @@ else ifeq ($(LIBRETRO), mednafen_ngp)
 	#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
+	APP_ICON            = ctr/assets/mednafen_ngp.png
+	#APP_BANNER          = ctr/assets/libretro_banner.png
+	#APP_AUDIO           = ctr/assets/silent.wav
 
 else ifeq ($(LIBRETRO), 2048)
 	APP_TITLE           = 2048 Libretro
@@ -106,9 +106,9 @@ else ifeq ($(LIBRETRO), 2048)
 	#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
+	APP_ICON            = ctr/assets/2048.png
+	#APP_BANNER          = ctr/assets/libretro_banner.png
+	#APP_AUDIO           = ctr/assets/silent.wav
 
 else ifeq ($(LIBRETRO), picodrive)
 	APP_TITLE           = Picodrive Libretro
@@ -116,9 +116,9 @@ else ifeq ($(LIBRETRO), picodrive)
 	#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
+	APP_ICON            = ctr/assets/picodrive.png
+	#APP_BANNER          = ctr/assets/libretro_banner.png
+	#APP_AUDIO           = ctr/assets/silent.wav
 
 else ifeq ($(LIBRETRO), snes9x_next)
 	APP_TITLE           = Snes9x Next Libretro
@@ -126,9 +126,9 @@ else ifeq ($(LIBRETRO), snes9x_next)
 	#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
+	APP_ICON            = ctr/assets/snes9x_next.png
+	#APP_BANNER          = ctr/assets/libretro_banner.png
+	#APP_AUDIO           = ctr/assets/silent.wav
 
 else ifeq ($(LIBRETRO), mgba)
 	APP_TITLE           = mGBA Libretro
@@ -136,9 +136,9 @@ else ifeq ($(LIBRETRO), mgba)
 	APP_AUTHOR          = Jeffrey Pfau
 	APP_PRODUCT_CODE    = RARCH-MGBA
 	APP_UNIQUE_ID       = 0xBAC0E
-	APP_ICON            = ctr/mgba.png
-	#APP_BANNER          = ctr/libretro_banner.png
-	#APP_AUDIO           = ctr/silent.wav
+	APP_ICON            = ctr/assets/mgba.png
+	#APP_BANNER          = ctr/assets/libretro_banner.png
+	#APP_AUDIO           = ctr/assets/silent.wav
 
 else ifeq ($(LIBRETRO), quicknes)
 	APP_TITLE           = QuickNES Libretro
@@ -146,9 +146,9 @@ else ifeq ($(LIBRETRO), quicknes)
 	APP_AUTHOR          = blargg, kode54
 	APP_PRODUCT_CODE    = RARCH-QUICKNES
 	APP_UNIQUE_ID       = 0xBAC0F
-	APP_ICON            = ctr/quicknes.png
-	#APP_BANNER          = ctr/libretro_banner.png
-	#APP_AUDIO           = ctr/silent.wav
+	APP_ICON            = ctr/assets/quicknes.png
+	#APP_BANNER          = ctr/assets/libretro_banner.png
+	#APP_AUDIO           = ctr/assets/silent.wav
 
 else ifeq ($(LIBRETRO), fb_alpha_neo)
 	APP_TITLE           = Neo Geo (FB Alpha)
@@ -156,9 +156,9 @@ else ifeq ($(LIBRETRO), fb_alpha_neo)
 	APP_AUTHOR          = Team FB Alpha
 	APP_PRODUCT_CODE    = RARCH-FBANEOGEO
 	APP_UNIQUE_ID       = 0xBAC10
-	APP_ICON            = ctr/fb_alpha_neo.png
-	#APP_BANNER          = ctr/libretro_banner.png
-	#APP_AUDIO           = ctr/silent.wav
+	APP_ICON            = ctr/assets/fb_alpha_neo.png
+	#APP_BANNER          = ctr/assets/libretro_banner.png
+	#APP_AUDIO           = ctr/assets/silent.wav
 	APP_SYSTEM_MODE     = 80MB
 
 else ifeq ($(LIBRETRO), fb_alpha_cps1)
@@ -167,9 +167,9 @@ else ifeq ($(LIBRETRO), fb_alpha_cps1)
 	APP_AUTHOR          = Team FB Alpha
 	APP_PRODUCT_CODE    = RARCH-FBACPS1
 	APP_UNIQUE_ID       = 0xBAC11
-	APP_ICON            = ctr/fb_alpha_cps1.png
-	#APP_BANNER          = ctr/libretro_banner.png
-	#APP_AUDIO           = ctr/silent.wav
+	APP_ICON            = ctr/assets/fb_alpha_cps1.png
+	#APP_BANNER          = ctr/assets/libretro_banner.png
+	#APP_AUDIO           = ctr/assets/silent.wav
 
 else ifeq ($(LIBRETRO), fb_alpha_cps2)
 	APP_TITLE           = Final Burn Alpha - CPS-2
@@ -177,9 +177,9 @@ else ifeq ($(LIBRETRO), fb_alpha_cps2)
 	APP_AUTHOR          = Team FB Alpha
 	APP_PRODUCT_CODE    = RARCH-FBACPS2
 	APP_UNIQUE_ID       = 0xBAC12
-	APP_ICON            = ctr/fb_alpha_cps2.png
-	#APP_BANNER          = ctr/libretro_banner.png
-	#APP_AUDIO           = ctr/silent.wav
+	APP_ICON            = ctr/assets/fb_alpha_cps2.png
+	#APP_BANNER          = ctr/assets/libretro_banner.png
+	#APP_AUDIO           = ctr/assets/silent.wav
 	APP_SYSTEM_MODE     = 80MB
 
 else ifeq ($(LIBRETRO), catsfc_plus)
@@ -188,9 +188,9 @@ else ifeq ($(LIBRETRO), catsfc_plus)
 	#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
+	APP_ICON            = ctr/assets/catsfc_plus.png
+	#APP_BANNER          = ctr/assets/libretro_banner.png
+	#APP_AUDIO           = ctr/assets/silent.wav
 
 else ifeq ($(LIBRETRO), mednafen_pce_fast)
 	APP_TITLE           = Mednafen/Beetle PCE FAST
@@ -198,9 +198,9 @@ else ifeq ($(LIBRETRO), mednafen_pce_fast)
 	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
+	APP_ICON            = ctr/assets/mednafen_pce_fast.png
+	#APP_BANNER          = ctr/assets/libretro_banner.png
+	#APP_AUDIO           = ctr/assets/silent.wav
 
 else ifeq ($(LIBRETRO), pcsx_rearmed)
 	APP_TITLE           = PCSX ReARMed
@@ -208,9 +208,9 @@ else ifeq ($(LIBRETRO), pcsx_rearmed)
 	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
+	APP_ICON            = ctr/assets/pcsx_rearmed.png
+	#APP_BANNER          = ctr/assets/libretro_banner.png
+	#APP_AUDIO           = ctr/assets/silent.wav
 	
 else ifeq ($(LIBRETRO), fmsx)
 	APP_TITLE           = fMSX
@@ -218,9 +218,9 @@ else ifeq ($(LIBRETRO), fmsx)
 	APP_AUTHOR          = Marat Fayzullin
 	APP_PRODUCT_CODE    = RARCH-FMSX
 	APP_UNIQUE_ID       = 0xBAC16
-	APP_ICON            = ctr/fmsx.png
-	#APP_BANNER          = ctr/libretro_banner.png
-	#APP_AUDIO           = ctr/silent.wav
+	APP_ICON            = ctr/assets/fmsx.png
+	#APP_BANNER          = ctr/assets/libretro_banner.png
+	#APP_AUDIO           = ctr/assets/silent.wav
 	
 else ifeq ($(LIBRETRO), fb_alpha)
 	APP_TITLE           = Final Burn Alpha
@@ -228,9 +228,9 @@ else ifeq ($(LIBRETRO), fb_alpha)
 	APP_AUTHOR          = Team FB Alpha
 	APP_PRODUCT_CODE    = RARCH-FBA
 	APP_UNIQUE_ID       = 0xBAC17
-	#APP_ICON            = ctr/default.png
-	#APP_BANNER          = ctr/libretro_banner.png
-	#APP_AUDIO           = ctr/silent.wav
+	#APP_ICON            = ctr/assets/default.png
+	#APP_BANNER          = ctr/assets/libretro_banner.png
+	#APP_AUDIO           = ctr/assets/silent.wav
 	APP_BIG_TEXT_SECTION = 1
 	
 else ifeq ($(LIBRETRO), mame2003)
@@ -239,9 +239,9 @@ else ifeq ($(LIBRETRO), mame2003)
 	#APP_AUTHOR          = Team Libretro
 	APP_PRODUCT_CODE    = RARCH-MAME2003
 	APP_UNIQUE_ID       = 0xBAC18
-	APP_ICON            = ctr/mame.png
-	#APP_BANNER          = ctr/libretro_banner.png
-	#APP_AUDIO           = ctr/silent.wav
+	APP_ICON            = ctr/assets/mame.png
+	#APP_BANNER          = ctr/assets/libretro_banner.png
+	#APP_AUDIO           = ctr/assets/silent.wav
 	APP_BIG_TEXT_SECTION = 1
 
 else ifeq ($(LIBRETRO), mame2000)
@@ -250,8 +250,19 @@ else ifeq ($(LIBRETRO), mame2000)
 	#APP_AUTHOR          = Team Libretro
 	APP_PRODUCT_CODE    = RARCH-MAME2000
 	APP_UNIQUE_ID       = 0xBAC19
-	APP_ICON            = ctr/mame.png
-	#APP_BANNER          = ctr/libretro_banner.png
-	#APP_AUDIO           = ctr/silent.wav
+	APP_ICON            = ctr/assets/mame.png
+	#APP_BANNER          = ctr/assets/libretro_banner.png
+	#APP_AUDIO           = ctr/assets/silent.wav
 	APP_BIG_TEXT_SECTION = 1
+
+else ifeq ($(LIBRETRO), pocketsnes)
+	APP_TITLE           = Pocket Snes
+	#APP_DESCRIPTION     = Retroarch 3DS
+	APP_AUTHOR          = various
+	APP_PRODUCT_CODE    = RARCH-POCKETSNES
+	APP_UNIQUE_ID       = 0xBAC1A
+	APP_ICON            = ctr/assets/pocketsnes.png
+	#APP_BANNER          = ctr/assets/libretro_banner.png
+	#APP_AUDIO           = ctr/assets/silent.wav
+
 endif
diff --git a/ctr/2048.png b/ctr/assets/2048.png
similarity index 100%
rename from ctr/2048.png
rename to ctr/assets/2048.png
diff --git a/ctr/catsfc.png b/ctr/assets/catsfc.png
similarity index 100%
rename from ctr/catsfc.png
rename to ctr/assets/catsfc.png
diff --git a/ctr/catsfc_plus.png b/ctr/assets/catsfc_plus.png
similarity index 100%
rename from ctr/catsfc_plus.png
rename to ctr/assets/catsfc_plus.png
diff --git a/ctr/default.png b/ctr/assets/default.png
similarity index 100%
rename from ctr/default.png
rename to ctr/assets/default.png
diff --git a/ctr/fb_alpha_cps1.png b/ctr/assets/fb_alpha_cps1.png
similarity index 100%
rename from ctr/fb_alpha_cps1.png
rename to ctr/assets/fb_alpha_cps1.png
diff --git a/ctr/fb_alpha_cps2.png b/ctr/assets/fb_alpha_cps2.png
similarity index 100%
rename from ctr/fb_alpha_cps2.png
rename to ctr/assets/fb_alpha_cps2.png
diff --git a/ctr/fb_alpha_neo.png b/ctr/assets/fb_alpha_neo.png
similarity index 100%
rename from ctr/fb_alpha_neo.png
rename to ctr/assets/fb_alpha_neo.png
diff --git a/ctr/fceumm.png b/ctr/assets/fceumm.png
similarity index 100%
rename from ctr/fceumm.png
rename to ctr/assets/fceumm.png
diff --git a/ctr/fmsx.png b/ctr/assets/fmsx.png
similarity index 100%
rename from ctr/fmsx.png
rename to ctr/assets/fmsx.png
diff --git a/ctr/gambatte.png b/ctr/assets/gambatte.png
similarity index 100%
rename from ctr/gambatte.png
rename to ctr/assets/gambatte.png
diff --git a/ctr/genesis_plus_gx.png b/ctr/assets/genesis_plus_gx.png
similarity index 100%
rename from ctr/genesis_plus_gx.png
rename to ctr/assets/genesis_plus_gx.png
diff --git a/ctr/gpsp.png b/ctr/assets/gpsp.png
similarity index 100%
rename from ctr/gpsp.png
rename to ctr/assets/gpsp.png
diff --git a/ctr/libretro_banner.png b/ctr/assets/libretro_banner.png
similarity index 100%
rename from ctr/libretro_banner.png
rename to ctr/assets/libretro_banner.png
diff --git a/ctr/mame.png b/ctr/assets/mame.png
similarity index 100%
rename from ctr/mame.png
rename to ctr/assets/mame.png
diff --git a/ctr/mednafen_ngp.png b/ctr/assets/mednafen_ngp.png
similarity index 100%
rename from ctr/mednafen_ngp.png
rename to ctr/assets/mednafen_ngp.png
diff --git a/ctr/mednafen_pce_fast.png b/ctr/assets/mednafen_pce_fast.png
similarity index 100%
rename from ctr/mednafen_pce_fast.png
rename to ctr/assets/mednafen_pce_fast.png
diff --git a/ctr/mednafen_vb.png b/ctr/assets/mednafen_vb.png
similarity index 100%
rename from ctr/mednafen_vb.png
rename to ctr/assets/mednafen_vb.png
diff --git a/ctr/mednafen_wswan.png b/ctr/assets/mednafen_wswan.png
similarity index 100%
rename from ctr/mednafen_wswan.png
rename to ctr/assets/mednafen_wswan.png
diff --git a/ctr/mgba.png b/ctr/assets/mgba.png
similarity index 100%
rename from ctr/mgba.png
rename to ctr/assets/mgba.png
diff --git a/ctr/nestopia.png b/ctr/assets/nestopia.png
similarity index 100%
rename from ctr/nestopia.png
rename to ctr/assets/nestopia.png
diff --git a/ctr/nxengine.png b/ctr/assets/nxengine.png
similarity index 100%
rename from ctr/nxengine.png
rename to ctr/assets/nxengine.png
diff --git a/ctr/pcsx_rearmed.png b/ctr/assets/pcsx_rearmed.png
similarity index 100%
rename from ctr/pcsx_rearmed.png
rename to ctr/assets/pcsx_rearmed.png
diff --git a/ctr/picodrive.png b/ctr/assets/picodrive.png
similarity index 100%
rename from ctr/picodrive.png
rename to ctr/assets/picodrive.png
diff --git a/ctr/assets/pocketsnes.png b/ctr/assets/pocketsnes.png
new file mode 100644
index 0000000000..6be406107c
Binary files /dev/null and b/ctr/assets/pocketsnes.png differ
diff --git a/ctr/quicknes.png b/ctr/assets/quicknes.png
similarity index 100%
rename from ctr/quicknes.png
rename to ctr/assets/quicknes.png
diff --git a/ctr/silent.wav b/ctr/assets/silent.wav
similarity index 100%
rename from ctr/silent.wav
rename to ctr/assets/silent.wav
diff --git a/ctr/snes9x_next.png b/ctr/assets/snes9x_next.png
similarity index 100%
rename from ctr/snes9x_next.png
rename to ctr/assets/snes9x_next.png
diff --git a/gfx/drivers/ctr_gfx.c b/gfx/drivers/ctr_gfx.c
index b8e73a6f03..4a0ff9c51d 100644
--- a/gfx/drivers/ctr_gfx.c
+++ b/gfx/drivers/ctr_gfx.c
@@ -542,7 +542,7 @@ static bool ctr_frame(void* data, const void* frame,
       {
          /* can copy the buffer directly with the GPU */
 //         GSPGPU_FlushDataCache(frame, pitch * height);
-         ctrGuSetCommandList_First(true,frame, pitch * height,0,0,0,0);
+         ctrGuSetCommandList_First(true,(void*)frame, pitch * height,0,0,0,0);
          ctrGuCopyImage(true, frame, pitch / (ctr->rgb32? 4: 2), height, ctr->rgb32 ? CTRGU_RGBA8: CTRGU_RGB565, false,
                         ctr->texture_swizzled, ctr->texture_width, ctr->rgb32 ? CTRGU_RGBA8: CTRGU_RGB565,  true);
       }
diff --git a/menu/menu_display.c b/menu/menu_display.c
index bffb253a22..a2dffb9e7a 100644
--- a/menu/menu_display.c
+++ b/menu/menu_display.c
@@ -18,6 +18,7 @@
 #include <queues/message_queue.h>
 #include <retro_miscellaneous.h>
 #include <gfx/math/matrix_4x4.h>
+#include <formats/image.h>
 
 #include "../config.def.h"
 #include "../gfx/video_thread_wrapper.h"