diff --git a/Makefile.ctr b/Makefile.ctr
index f1cbd87da5..4b1c034361 100644
--- a/Makefile.ctr
+++ b/Makefile.ctr
@@ -176,15 +176,28 @@ STRIP   := $(PREFIX)strip
 NM      := $(PREFIX)nm
 LD      := $(CXX)
 
-ifneq ($(findstring Linux,$(shell uname -a)),)
-	MAKEROM    = pkg/ctr/tools/makerom-linux
-	BANNERTOOL = pkg/ctr/tools/bannertool-linux
-else ifneq ($(findstring Darwin,$(shell uname -a)),)
-	MAKEROM    = pkg/ctr/tools/makerom-mac
-	BANNERTOOL = pkg/ctr/tools/bannertool-mac
+ifeq ($(strip $(CTRBANNERTOOL)),)
+	ifneq ($(findstring Linux,$(shell uname -a)),)
+		BANNERTOOL = pkg/ctr/tools/bannertool-linux
+	else ifneq ($(findstring Darwin,$(shell uname -a)),)
+		BANNERTOOL = pkg/ctr/tools/bannertool-mac
+	else
+		BANNERTOOL = pkg/ctr/tools/bannertool.exe
+	endif
 else
-	MAKEROM    = pkg/ctr/tools/makerom.exe
-	BANNERTOOL = pkg/ctr/tools/bannertool.exe
+	BANNERTOOL = $(CTRBANNERTOOL)
+endif
+
+ifeq ($(strip $(CTRMAKEROM)),)
+	ifneq ($(findstring Linux,$(shell uname -a)),)
+		MAKEROM    = pkg/ctr/tools/makerom-linux
+	else ifneq ($(findstring Darwin,$(shell uname -a)),)
+		MAKEROM    = pkg/ctr/tools/makerom-mac
+	else
+		MAKEROM    = pkg/ctr/tools/makerom.exe
+	endif
+else
+	MAKEROM = $(CTRMAKEROM)
 endif
 
 %.o: %.vsh %.gsh
diff --git a/Makefile.ctr.salamander b/Makefile.ctr.salamander
index d2000812f3..2440d044f9 100644
--- a/Makefile.ctr.salamander
+++ b/Makefile.ctr.salamander
@@ -122,15 +122,28 @@ STRIP   := $(PREFIX)strip
 NM      := $(PREFIX)nm
 LD      := $(CXX)
 
-ifneq ($(findstring Linux,$(shell uname -a)),)
-	MAKEROM    = pkg/ctr/tools/makerom-linux
-	BANNERTOOL = pkg/ctr/tools/bannertool-linux
-else ifneq ($(findstring Darwin,$(shell uname -a)),)
-	MAKEROM    = pkg/ctr/tools/makerom-mac
-	BANNERTOOL = pkg/ctr/tools/bannertool-mac
+ifeq ($(strip $(CTRBANNERTOOL)),)
+	ifneq ($(findstring Linux,$(shell uname -a)),)
+		BANNERTOOL = pkg/ctr/tools/bannertool-linux
+	else ifneq ($(findstring Darwin,$(shell uname -a)),)
+		BANNERTOOL = pkg/ctr/tools/bannertool-mac
+	else
+		BANNERTOOL = pkg/ctr/tools/bannertool.exe
+	endif
 else
-	MAKEROM    = pkg/ctr/tools/makerom.exe
-	BANNERTOOL = pkg/ctr/tools/bannertool.exe
+	BANNERTOOL = $(CTRBANNERTOOL)
+endif
+
+ifeq ($(strip $(CTRMAKEROM)),)
+	ifneq ($(findstring Linux,$(shell uname -a)),)
+		MAKEROM    = pkg/ctr/tools/makerom-linux
+	else ifneq ($(findstring Darwin,$(shell uname -a)),)
+		MAKEROM    = pkg/ctr/tools/makerom-mac
+	else
+		MAKEROM    = pkg/ctr/tools/makerom.exe
+	endif
+else
+	MAKEROM = $(CTRMAKEROM)
 endif
 
 %.o: %.vsh %.gsh
diff --git a/pkg/ctr/assets/silent.cwav b/pkg/ctr/assets/silent.cwav
new file mode 100644
index 0000000000..ea81c48bc3
Binary files /dev/null and b/pkg/ctr/assets/silent.cwav differ
diff --git a/retroarch_3ds.3ds b/retroarch_3ds.3ds
new file mode 100644
index 0000000000..50c316089f
Binary files /dev/null and b/retroarch_3ds.3ds differ
diff --git a/retroarch_3ds.bnr b/retroarch_3ds.bnr
new file mode 100644
index 0000000000..6aebaec35c
Binary files /dev/null and b/retroarch_3ds.bnr differ
diff --git a/retroarch_3ds.cia b/retroarch_3ds.cia
new file mode 100644
index 0000000000..f9fc003290
Binary files /dev/null and b/retroarch_3ds.cia differ
diff --git a/retroarch_3ds.core b/retroarch_3ds.core
new file mode 100644
index 0000000000..87e56bc801
--- /dev/null
+++ b/retroarch_3ds.core
@@ -0,0 +1 @@
+0xBAC03
diff --git a/retroarch_3ds.icn b/retroarch_3ds.icn
new file mode 100644
index 0000000000..12fcf58ad4
Binary files /dev/null and b/retroarch_3ds.icn differ