diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6bbae76e3b02df1c55c30ebc3b5eaaef45e82740..a1855a62fce1052a0005316c884bfccd2add7707 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,8 @@ All notable changes to this project will be documented in this file.
 ## [7.1-Reloaded]
 - Fix rpiimager by reducing descriptions and change os order
 - Remove updatev2 directory from sources
+## [Next]
+- Fix Supermodel build and move Nvram on saves path
 - Fix betatest TESTING.md lint script
 - Fix high cpu load with second minitft scripts
 - Fix NOOBS installation
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index de46cb4b11849f6a7d878d5e593bdde683aa3ba7..374b1aa08df1819eda9337966a47e1f90b616993 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -70,6 +70,7 @@
 - Bump Kodi to 18.9
 
 ### Fixes
+- Fix Supermodel build and move Nvram path
 - Fix AdvanceMAME
 - Fix freezes on megadrive/picodrive
 - Fix broken WIFI on some Intel chips
diff --git a/configs/recalbox-x86_64_defconfig b/configs/recalbox-x86_64_defconfig
index 8cae8a59d3419cc5bb3b5d987bd1d637f361a3a1..6eeb082b38b23d19d6483ee0b66edaafa89630b1 100644
--- a/configs/recalbox-x86_64_defconfig
+++ b/configs/recalbox-x86_64_defconfig
@@ -116,7 +116,6 @@ BR2_PACKAGE_MESA3D_LLVM=y
 BR2_PACKAGE_MESA3D_OPENCL=y
 BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_I915=y
 BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS=n
-BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU=y
 BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R300=y
 BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU=y
 BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600=y
@@ -213,9 +212,7 @@ BR2_PACKAGE_PYTHON_PSUTIL=y
 BR2_PACKAGE_LIBZIP=y
 BR2_PACKAGE_TCL=y
 BR2_PACKAGE_EXPECT=y
-BR2_PACKAGE_PYTHON_PSUTIL=y
 BR2_PACKAGE_LIBVPX=y
-BR2_PACKAGE_LIBZIP=y
 BR2_PACKAGE_SNAPPY=y
 BR2_PACKAGE_LIBWEBSOCKETS=y
 BR2_PACKAGE_CA_CERTIFICATES=y
@@ -229,7 +226,6 @@ BR2_PACKAGE_LIBGTK2=y
 BR2_PACKAGE_LIBSVG_CAIRO=y
 BR2_PACKAGE_LIBVA_INTEL_DRIVER=y
 BR2_PACKAGE_TSLIB=y
-BR2_PACKAGE_X264=y
 BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBCURL_GNUTLS=y
 BR2_PACKAGE_BOOST=y
@@ -412,7 +408,6 @@ BR2_PACKAGE_LIBRETRO_XMIL=y
 BR2_PACKAGE_LIBRETRO_XRICK=y
 BR2_PACKAGE_LIBRETRO_YABASANSHIRO=y
 BR2_PACKAGE_LIBRETRO_YABAUSE=y
-BR2_PACKAGE_SUPERMODEL=y
 BR2_PACKAGE_HHPC=y
 BR2_PACKAGE_JSTEST2=y
 BR2_PACKAGE_WSD=y
diff --git a/package/recalbox-romfs/recalbox-romfs-model3/roms/model3/_lisezmoi.txt b/package/recalbox-romfs/recalbox-romfs-model3/roms/model3/_lisezmoi.txt
index db7a2a8c61d9f5e301f42130cdebf76a3e05c268..25ff0a2c6d007e9f0d1884f81753df42ab137f12 100644
--- a/package/recalbox-romfs/recalbox-romfs-model3/roms/model3/_lisezmoi.txt
+++ b/package/recalbox-romfs/recalbox-romfs-model3/roms/model3/_lisezmoi.txt
@@ -1,7 +1,17 @@
 ## RECALBOX - SYSTEM SEGA MODEL3 ##
 
-Placez ici vos roms mame.
+Placez ici vos roms model3.
 
-Les roms doivent avoir l'extension ".zip"
+Les roms doivent avoir l'extension ".zip" provenant du romset mame 0.220
 
- Les roms doivent provenir du romset mame 0.219
+Ce système supporte une roms compressée au format .zip
+Attention toutefois, il ne s'agit que d'une archive.
+Les fichiers contenus dans les .zip doivent correspondre aux extensions citées précédemment.
+De plus, chaque fichier .zip ne doit contenir qu'une seule rom compressée.
+
+Pour le problème de "network board not present" dans un jeu:
+(https://www.supermodel3.com/FAQ.html#NetworkBoardError)
+Faire L3 sur la manette ou 8 sur le clavier
+Aller sur Backup data clear (utiliser R3 sur manette ou 7 sur clavier) et valider
+Aller dans Game Assignements
+Mettre Link Id sur Single
\ No newline at end of file
diff --git a/package/recalbox-romfs/recalbox-romfs-model3/roms/model3/_readme.txt b/package/recalbox-romfs/recalbox-romfs-model3/roms/model3/_readme.txt
index 75bf1d36be60655d481c62a59fe017000b0916dc..0c159a485e33941148ea8420eca4d87b67b5f4ff 100644
--- a/package/recalbox-romfs/recalbox-romfs-model3/roms/model3/_readme.txt
+++ b/package/recalbox-romfs/recalbox-romfs-model3/roms/model3/_readme.txt
@@ -1,8 +1,16 @@
 ## RECALBOX - SYSTEM SEGA MODEL3 ##
 
-Put your mame roms in this directory.
+Put your model3 roms in this directory.
 
-Rom files must have a ".zip" extension.
+Rom files must have a ".zip" extension from romset mame 0.220
 
-compatible roms come from a 0.219 mame romset
+This system allows to use compressed roms on .zip
+But, it is only an archive. Files inside the .zip must match with extensions mentioned above.
+Each .zip file must contain only one compressed rom.
 
+For the problem of "network board not present" in game :
+(https://www.supermodel3.com/FAQ.html#NetworkBoardError)
+Do L3 on the controller or 8 on the keyboard
+Go to Backup data clear (use R3 on a controller or 7 on the keyboard) and validate
+Go to Game Assignments
+Put Link Id on Single
\ No newline at end of file
diff --git a/package/recalbox-romfs/recalbox-romfs-solarus.old/Config.in b/package/recalbox-romfs/recalbox-romfs-solarus.old/Config.in
deleted file mode 100644
index 31c33674d3168d0f6024d15efd0a09650735823d..0000000000000000000000000000000000000000
--- a/package/recalbox-romfs/recalbox-romfs-solarus.old/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config BR2_PACKAGE_RECALBOX_ROMFS_SOLARUS
-	bool "recalbox-romfs-solarus"
-	select BR2_PACKAGE_RECALBOX_ROMS
-	depends on BR2_PACKAGE_SOLARUS_RECALBOX
-	help
-	  share_init/roms and xml for solarus
diff --git a/package/recalbox-romfs/recalbox-romfs-solarus.old/recalbox-romfs-solarus.mk b/package/recalbox-romfs/recalbox-romfs-solarus.old/recalbox-romfs-solarus.mk
deleted file mode 100644
index e1fc222b74a05b1f4edd0b12bcd5e5505ce64678..0000000000000000000000000000000000000000
--- a/package/recalbox-romfs/recalbox-romfs-solarus.old/recalbox-romfs-solarus.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-################################################################################
-#
-# recalbox-romfs-solarus
-#
-################################################################################
-
-# Package generated with :
-# ./scripts/linux/empack.py --force --system solarus --extension '.zip .solarus' --fullname 'Solarus' --platform solarus --theme solarus 1:solarus:solarus:BR2_PACKAGE_RECALBOX_SOLARUS
-
-# Name the 3 vars as the package requires
-RECALBOX_ROMFS_SOLARUS_SOURCE = 
-RECALBOX_ROMFS_SOLARUS_SITE = 
-RECALBOX_ROMFS_SOLARUS_INSTALL_STAGING = NO
-# Set the system name
-SYSTEM_NAME_SOLARUS = solarus
-SYSTEM_XML_SOLARUS = $(@D)/$(SYSTEM_NAME_SOLARUS).xml
-# System rom path
-SOURCE_ROMDIR_SOLARUS = $(RECALBOX_ROMFS_SOLARUS_PKGDIR)/roms
-
-# CONFIGGEN_STD_CMD is defined in recalbox-romfs, so take good care that
-# variables are global across buildroot
-
-
-ifneq ($(BR2_PACKAGE_RECALBOX_SOLARUS),)
-define CONFIGURE_MAIN_SOLARUS_START
-	$(call RECALBOX_ROMFS_CALL_ADD_SYSTEM,$(SYSTEM_XML_SOLARUS),Solarus,$(SYSTEM_NAME_SOLARUS),.zip .solarus,solarus,solarus)
-endef
-
-ifneq ($(BR2_PACKAGE_RECALBOX_SOLARUS),)
-define CONFIGURE_SOLARUS_SOLARUS_START
-	$(call RECALBOX_ROMFS_CALL_START_EMULATOR,$(SYSTEM_XML_SOLARUS),solarus)
-endef
-ifeq ($(BR2_PACKAGE_RECALBOX_SOLARUS),y)
-define CONFIGURE_SOLARUS_SOLARUS_SOLARUS_DEF
-	$(call RECALBOX_ROMFS_CALL_ADD_CORE,$(SYSTEM_XML_SOLARUS),solarus,1)
-endef
-endif
-
-define CONFIGURE_SOLARUS_SOLARUS_END
-	$(call RECALBOX_ROMFS_CALL_END_EMULATOR,$(SYSTEM_XML_SOLARUS))
-endef
-endif
-
-
-
-define CONFIGURE_MAIN_SOLARUS_END
-	$(call RECALBOX_ROMFS_CALL_END_SYSTEM,$(SYSTEM_XML_SOLARUS),$(SOURCE_ROMDIR_SOLARUS),$(@D))
-endef
-endif
-
-define RECALBOX_ROMFS_SOLARUS_CONFIGURE_CMDS
-	$(CONFIGURE_MAIN_SOLARUS_START)
-	$(CONFIGURE_SOLARUS_SOLARUS_START)
-	$(CONFIGURE_SOLARUS_SOLARUS_SOLARUS_DEF)
-	$(CONFIGURE_SOLARUS_SOLARUS_END)
-	$(CONFIGURE_MAIN_SOLARUS_END)
-endef
-
-$(eval $(generic-package))
diff --git a/package/supermodel/001-folder-directory.patch b/package/supermodel/001-folder-directory.patch
index a3f8c51f4329308703c1f33916cc127588aedcf3..dde2f855cf9b85b3ede145b63a88fe7997bfc1cd 100644
--- a/package/supermodel/001-folder-directory.patch
+++ b/package/supermodel/001-folder-directory.patch
@@ -32,7 +32,7 @@
    CBlockFile  NVRAM;
  
 -  std::string file_path = Util::Format() << "NVRAM/" << Model3->GetGame().name << ".nv";
-+  std::string file_path = Util::Format() << "../../../recalbox/share/system/configs/model3/NVRAM/" << Model3->GetGame().name << ".nv";
++  std::string file_path = Util::Format() << "../../../recalbox/share/saves/model3/NVRAM/" << Model3->GetGame().name << ".nv";
    if (OKAY != NVRAM.Create(file_path, "Supermodel NVRAM State", "Supermodel Version " SUPERMODEL_VERSION))
    {
      ErrorLog("Unable to save NVRAM to '%s'. Make sure directory exists!", file_path.c_str());
@@ -41,7 +41,7 @@
  
    // Generate file path
 -  std::string file_path = Util::Format() << "NVRAM/" << Model3->GetGame().name << ".nv";
-+  std::string file_path = Util::Format() << "../../../recalbox/share/system/configs/model3/NVRAM/" << Model3->GetGame().name << ".nv";
++  std::string file_path = Util::Format() << "../../../recalbox/share/saves/model3/NVRAM/" << Model3->GetGame().name << ".nv";
  
    // Open and check to make sure format is correct
    if (OKAY != NVRAM.Load(file_path))
diff --git a/package/supermodel/supermodel.mk b/package/supermodel/supermodel.mk
index c601d400e926c8586cc1452db89a3afefa0d27e7..11803aa3e0da3ac250e816efad1e2e02700bcc77 100644
--- a/package/supermodel/supermodel.mk
+++ b/package/supermodel/supermodel.mk
@@ -4,20 +4,22 @@
 #
 ################################################################################
 
-SUPERMODEL_VERSION = r832
+SUPERMODEL_VERSION = r833
 SUPERMODEL_SITE = svn://svn.code.sf.net/p/model3emu/code/trunk
 SUPERMODEL_SITE_METHOD = svn
 SUPERMODEL_LICENSE = GPL2
-SUPERMODEL_DEPENDENCIES = zlib libpng libogg libvorbis
+SUPERMODEL_DEPENDENCIES = zlib libpng libogg libvorbis sdl2_net sdl2
 
 define SUPERMODEL_BUILD_CMDS
 	cp $(@D)/Makefiles/Makefile.UNIX $(@D)/Makefile
-	$(SED) "s|-O2|-O3|g" $(@D)/Makefile
+	$(SED) "s|OPT = -Ofast|OPT = -O3 -fno-strict-aliasing|g" $(@D)/Makefiles/Rules.inc
+	$(SED) "s|-Ofast|-O3 -fno-strict-aliasing |g" $(@D)/Makefile
 	$(SED) "s|CC = gcc|CC = $(TARGET_CC)|g" $(@D)/Makefile
 	$(SED) "s|CXX = g++|CXX = $(TARGET_CXX)|g" $(@D)/Makefile
 	$(SED) "s|LD = gcc|LD = $(TARGET_CC)|g" $(@D)/Makefile
 	$(SED) "s|sdl2-config|$(STAGING_DIR)/usr/bin/sdl2-config|g" $(@D)/Makefile
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -f Makefile VERBOSE=1
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -f Makefile \
+	NET_BOARD=1 DEBUG=0 NEW_FRAME_TIMING=1 ENABLE_DEBUGGER=0
 endef
 
 define SUPERMODEL_INSTALL_TARGET_CMDS
@@ -27,7 +29,7 @@ define SUPERMODEL_INSTALL_TARGET_CMDS
 		$(TARGET_DIR)/recalbox/share_init/system/configs/model3/Games.xml
 	$(INSTALL) -D -m 0644 $(@D)/Config/Supermodel.ini \
 		$(TARGET_DIR)/recalbox/share_init/system/configs/model3/Supermodel.ini
-	mkdir -p $(TARGET_DIR)/recalbox/share_init/system/configs/model3/NVRAM
+	mkdir -p $(TARGET_DIR)/recalbox/share_init/saves/model3/NVRAM
 endef
 
 define SUPERMODEL_LINE_ENDINGS_FIXUP