diff --git a/config/config.go b/config/config.go
index 31e7be26..c18284ca 100644
--- a/config/config.go
+++ b/config/config.go
@@ -30,4 +30,9 @@ var FileTypeToEmulator = map[string]string{
 	"cue": "pcsx",
 	"zip": "mame",
 	"nes": "nes",
+	"smc": "snes",
+	"sfc": "snes",
+	"swc": "snes",
+	"fig": "snes",
+	"bs":  "snes",
 }
diff --git a/libretro/nanoarch/naemulator.go b/libretro/nanoarch/naemulator.go
index 77f37e35..b6584734 100644
--- a/libretro/nanoarch/naemulator.go
+++ b/libretro/nanoarch/naemulator.go
@@ -66,10 +66,10 @@ var NAEmulator *naEmulator
 
 // TODO: Load from config
 var emulatorCorePath = map[string]string{
-	"gba":  "libretro/cores/mgba_libretro.so",
-	"pcsx": "libretro/cores/mednafen_psx_libretro.so",
-	//"pcsx": "libretro/cores/mednafen_psx_hw_libretro.so",
+	"gba":    "libretro/cores/mgba_libretro.so",
+	"pcsx":   "libretro/cores/mednafen_psx_libretro.so",
 	"arcade": "libretro/cores/fbalpha2012_neogeo_libretro.so",
+	"snes":   "libretro/cores/mednafen_snes_libretro.so",
 	"mame":   "libretro/cores/mame2016_libretro.so",
 }