diff --git a/Jenkinsfile b/Jenkinsfile
index a4c5f12..aaa3557 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1 +1 @@
-buildPlugin(version: "Nexus", platforms: ["android-aarch64", "android-armv7", "osx-x86_64", "windows-i686", "windows-x86_64"])
+buildPlugin(version: "Nexus", platforms: ["android-aarch64", "android-armv7", "osx-x86_64", "osx-arm64", "windows-i686", "windows-x86_64"])
diff --git a/debian/control b/debian/control
index 8087d29..9d06ab3 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Maintainer: wsnipex <wsnipex@a1.net>
 Build-Depends: debhelper (>= 9.0.0),
                cmake,
                kodi-addon-dev,
-               libretro-gearsystem (>= 3.4.2) | gearsystem (>= 3.4.2)
+               libretro-gearsystem (>= 3.5.0) | gearsystem (>= 3.5.0)
 Standards-Version: 3.9.8
 Section: libs
 
diff --git a/depends/common/gearsystem/CMakeLists.txt b/depends/common/gearsystem/CMakeLists.txt
index 30d054d..20dec6e 100644
--- a/depends/common/gearsystem/CMakeLists.txt
+++ b/depends/common/gearsystem/CMakeLists.txt
@@ -26,7 +26,12 @@ if(CORE_SYSTEM_NAME STREQUAL windows)
 elseif(CORE_SYSTEM_NAME STREQUAL linux)
   set(BUILD_COMMAND $(MAKE) -C platforms/libretro -f Makefile  platform=unix ${LIBRETRO_DEBUG} GIT_VERSION=)
 elseif(CORE_SYSTEM_NAME STREQUAL osx)
-  set(BUILD_COMMAND $(MAKE) -C platforms/libretro -f Makefile  platform=osx ${LIBRETRO_DEBUG} GIT_VERSION=)
+  if(CPU STREQUAL arm64)
+    set(ARCH arm)
+  else()
+    set(ARCH intel)
+  endif()
+  set(BUILD_COMMAND $(MAKE) -C platforms/libretro -f Makefile  platform=osx arch=${ARCH} ${LIBRETRO_DEBUG} GIT_VERSION=)
 elseif(CORE_SYSTEM_NAME STREQUAL ios OR CORE_SYSTEM_NAME STREQUAL darwin_embedded)
   if(CORE_PLATFORM_NAME STREQUAL ios)
     set(LIBRETRO_SONAME gearsystem_libretro_ios${CMAKE_SHARED_LIBRARY_SUFFIX})
diff --git a/depends/common/gearsystem/gearsystem.txt b/depends/common/gearsystem/gearsystem.txt
index 80872e6..526e953 100644
--- a/depends/common/gearsystem/gearsystem.txt
+++ b/depends/common/gearsystem/gearsystem.txt
@@ -1 +1 @@
-gearsystem https://github.com/drhelius/Gearsystem/archive/a2e8af25e732dcc499c7f348c156ad78f6ac0645.tar.gz
+gearsystem https://github.com/drhelius/Gearsystem/archive/d4e65ab06913161e283acba873ae90e6f616c645.tar.gz
diff --git a/depends/windows/mingw/CMakeLists.txt b/depends/windows/mingw/CMakeLists.txt
index c42cea2..a4c2779 100644
--- a/depends/windows/mingw/CMakeLists.txt
+++ b/depends/windows/mingw/CMakeLists.txt
@@ -1,14 +1,13 @@
 cmake_minimum_required(VERSION 3.5)
 project(mingw)
 
-# TODO: Upload msys2 packages to mirrors
-#foreach(repo msys mingw32 mingw64)
-#  if(${repo} STREQUAL msys)
-#    file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/etc/pacman.d/mirrorlist.${repo} "Server = http://mirrors.kodi.tv/build-deps/win32/msys2/repos/${repo}2/$arch\n")
-#  else()
-#    file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/etc/pacman.d/mirrorlist.${repo} "Server = http://mirrors.kodi.tv/build-deps/win32/msys2/repos/${repo}\n")
-#  endif()
-#endforeach()
+foreach(repo msys mingw32 mingw64)
+  if(${repo} STREQUAL msys)
+    file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/etc/pacman.d/mirrorlist.${repo} "Server = http://mirrors.kodi.tv/build-deps/win32/msys2/repos/${repo}2/$arch\n")
+  else()
+    file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/etc/pacman.d/mirrorlist.${repo} "Server = http://mirrors.kodi.tv/build-deps/win32/msys2/repos/${repo}\n")
+  endif()
+endforeach()
 
 include(CheckSymbolExists)
 check_symbol_exists(_X86_ "Windows.h" _X86_)
diff --git a/game.libretro.gearsystem/addon.xml.in b/game.libretro.gearsystem/addon.xml.in
index 7037c01..bb5d998 100644
--- a/game.libretro.gearsystem/addon.xml.in
+++ b/game.libretro.gearsystem/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon id="game.libretro.gearsystem"
 		name="Sega - MS/GG/SG-1000 (Gearsystem)"
-		version="3.4.2.10"
+		version="3.5.0.11"
 		provider-name="Ignacio Sanchez">
 	<requires>
 		<import addon="game.libretro" version="1.0.0"/>
diff --git a/game.libretro.gearsystem/resources/language/resource.language.en_gb/strings.po b/game.libretro.gearsystem/resources/language/resource.language.en_gb/strings.po
index 29c65c7..1524e5b 100644
--- a/game.libretro.gearsystem/resources/language/resource.language.en_gb/strings.po
+++ b/game.libretro.gearsystem/resources/language/resource.language.en_gb/strings.po
@@ -59,3 +59,15 @@ msgstr ""
 msgctxt "#30008"
 msgid "Allow Up+Down / Left+Right"
 msgstr ""
+
+msgctxt "#30009"
+msgid "Aspect Ratio (restart)"
+msgstr ""
+
+msgctxt "#30010"
+msgid "Overscan"
+msgstr ""
+
+msgctxt "#30011"
+msgid "YM2413 (restart)"
+msgstr ""
diff --git a/game.libretro.gearsystem/resources/settings.xml b/game.libretro.gearsystem/resources/settings.xml
index f510db1..57acb59 100644
--- a/game.libretro.gearsystem/resources/settings.xml
+++ b/game.libretro.gearsystem/resources/settings.xml
@@ -5,8 +5,11 @@
 		<setting label="30002" type="select" id="gearsystem_region" values="Auto|Master System Japan|Master System Export|Game Gear Japan|Game Gear Export|Game Gear International" default="Auto"/>
 		<setting label="30003" type="select" id="gearsystem_mapper" values="Auto|ROM|SEGA|Codemasters|Korean|MSX|Janggun|SG-1000" default="Auto"/>
 		<setting label="30004" type="select" id="gearsystem_timing" values="Auto|NTSC (60 Hz)|PAL (50 Hz)" default="Auto"/>
+		<setting label="30009" type="select" id="gearsystem_aspect_ratio" values="1:1 PAR|4:3 DAR|16:9 DAR" default="1:1 PAR"/>
+		<setting label="30010" type="select" id="gearsystem_overscan" values="Disabled|Top+Bottom|Full (284 width)|Full (320 width)" default="Disabled"/>
 		<setting label="30005" type="select" id="gearsystem_bios_sms" values="Disabled|Enabled" default="Disabled"/>
 		<setting label="30006" type="select" id="gearsystem_bios_gg" values="Disabled|Enabled" default="Disabled"/>
+		<setting label="30011" type="select" id="gearsystem_ym2413" values="Auto|Disabled" default="Auto"/>
 		<setting label="30007" type="select" id="gearsystem_glasses" values="Both Eyes / OFF|Left Eye|Right Eye" default="Both Eyes / OFF"/>
 		<setting label="30008" type="select" id="gearsystem_up_down_allowed" values="Disabled|Enabled" default="Disabled"/>
 	</category>