diff --git a/depends/common/xrick/CMakeLists.txt b/depends/common/xrick/CMakeLists.txt
index 891387f..0750cb4 100644
--- a/depends/common/xrick/CMakeLists.txt
+++ b/depends/common/xrick/CMakeLists.txt
@@ -7,6 +7,21 @@ include(ExternalProject)
 
 string(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
+# Jenkins CI jobs can have this env var set
+# Use it if available
+if(DEFINED ENV{BUILDTHREADS})
+  set(build_job_count -j$ENV{BUILDTHREADS})
+  message(STATUS "Using $ENV{BUILDTHREADS} threads from ENV var BUILDTHREADS")
+else()
+  # Most likely a non CI build, so do a best attempt just using ProcessorCount
+  include(ProcessorCount)
+  ProcessorCount(cpu_count)
+  if(NOT cpu_count EQUAL 0)
+    set(build_job_count -j${cpu_count})
+    message(STATUS "Using ${cpu_count} threads deduced by ProcessorCount")
+  endif()
+endif()
+
 set(LIBRETRO_BINARY_DIR .)
 set(LIBRETRO_SONAME xrick_libretro${CMAKE_SHARED_LIBRARY_SUFFIX})
 set(LIBRETRO_JNISONAME libretro${CMAKE_SHARED_LIBRARY_SUFFIX})
@@ -23,18 +38,23 @@ if(CORE_SYSTEM_NAME STREQUAL windows)
     set(MSYSTEM MINGW32)
   endif()
   set(BUILD_COMMAND ${MINGW_MAKE}
-                    -j$ENV{NUMBER_OF_PROCESSORS}
                     -C .
                     -f Makefile.libretro
-                    platform=win
+                    ${build_job_count}
+                    ${LIBRETRO_DEBUG}
+                    GIT_VERSION=
                     MSYSTEM=${MSYSTEM}
-                     ${LIBRETRO_DEBUG} GIT_VERSION=)
+                    platform=win
+                    )
 elseif(CORE_SYSTEM_NAME STREQUAL linux)
   set(BUILD_COMMAND $(MAKE)
                     -C .
                     -f Makefile.libretro
+                    ${build_job_count}
+                    ${LIBRETRO_DEBUG}
+                    GIT_VERSION=
                     platform=unix
-                     ${LIBRETRO_DEBUG} GIT_VERSION=)
+                    )
 elseif(CORE_SYSTEM_NAME STREQUAL osx)
   if(CPU STREQUAL arm64)
     set(ARCH arm)
@@ -44,12 +64,15 @@ elseif(CORE_SYSTEM_NAME STREQUAL osx)
   set(BUILD_COMMAND $(MAKE)
                     -C .
                     -f Makefile.libretro
-                    platform=osx
+                    ${build_job_count}
+                    ${LIBRETRO_DEBUG}
                     arch=${ARCH}
                     CROSS_COMPILE=1
-                    LIBRETRO_APPLE_PLATFORM=${CPU}-apple-macos
+                    GIT_VERSION=
                     LIBRETRO_APPLE_ISYSROOT=${CMAKE_OSX_SYSROOT}
-                     ${LIBRETRO_DEBUG} GIT_VERSION=)
+                    LIBRETRO_APPLE_PLATFORM=${CPU}-apple-macos
+                    platform=osx
+                    )
 elseif(CORE_SYSTEM_NAME STREQUAL ios OR CORE_SYSTEM_NAME STREQUAL darwin_embedded)
   if(CORE_PLATFORM_NAME STREQUAL ios)
     set(LIBRETRO_SONAME xrick_libretro_ios${CMAKE_SHARED_LIBRARY_SUFFIX})
@@ -61,15 +84,21 @@ elseif(CORE_SYSTEM_NAME STREQUAL ios OR CORE_SYSTEM_NAME STREQUAL darwin_embedde
     set(BUILD_COMMAND IOSSDK=${CMAKE_OSX_SYSROOT} $(MAKE)
                                                   -C .
                                                   -f Makefile.libretro
+                                                  ${build_job_count}
+                                                  ${LIBRETRO_DEBUG}
+                                                  GIT_VERSION=
                                                   platform=${PLATFORM}
-                                                   ${LIBRETRO_DEBUG} GIT_VERSION=)
+                                                  )
   elseif(CORE_PLATFORM_NAME STREQUAL tvos)
     set(LIBRETRO_SONAME xrick_libretro_tvos${CMAKE_SHARED_LIBRARY_SUFFIX})
     set(BUILD_COMMAND IOSSDK=${CMAKE_OSX_SYSROOT} $(MAKE)
                                                   -C .
                                                   -f Makefile.libretro
+                                                  ${build_job_count}
+                                                  ${LIBRETRO_DEBUG}
+                                                  GIT_VERSION=
                                                   platform=tvos-arm64
-                                                   ${LIBRETRO_DEBUG} GIT_VERSION=)
+                                                  )
   endif()
 elseif(CORE_SYSTEM_NAME STREQUAL android)
   if(NOT NDKROOT)
@@ -84,20 +113,25 @@ elseif(CORE_SYSTEM_NAME STREQUAL android)
   endif()
   set(BUILD_COMMAND GNUMAKE=$(MAKE) ${NDKROOT}/ndk-build
                                     -C jni
+                                    ${build_job_count}
+                                    ${LIBRETRO_DEBUG}
                                     APP_ABI=${PLATFORM}
-                                    V7NEONOPTIMIZATION=1
+                                    APP_SHORT_COMMANDS=true
+                                    GIT_VERSION=
                                     NDK_LIBS_OUT=${PROJECT_SOURCE_DIR}/${LIBRETRO_BINARY_DIR}
                                     V=1
-                                     ${LIBRETRO_DEBUG} GIT_VERSION=
+                                    V7NEONOPTIMIZATION=1
+                                    
                     && cp ${PROJECT_SOURCE_DIR}/${LIBRETRO_BINARY_DIR}/${PLATFORM}/${LIBRETRO_JNISONAME} ${PROJECT_SOURCE_DIR}/${LIBRETRO_BINARY_DIR}/${LIBRETRO_SONAME})
-elseif(CORE_SYSTEM_NAME STREQUAL rbpi)
-  message(FATAL_ERROR "${PROJECT_NAME} needs RPi build command in CMakeLists.txt!")
 elseif(CORE_SYSTEM_NAME STREQUAL freebsd)
   set(BUILD_COMMAND $(MAKE)
                     -C .
                     -f Makefile.libretro
+                    ${build_job_count}
+                    ${LIBRETRO_DEBUG}
+                    GIT_VERSION=
                     platform=unix
-                     ${LIBRETRO_DEBUG} GIT_VERSION=)
+                    )
 else()
   message(FATAL_ERROR "${PROJECT_NAME} - Unknown system: ${CORE_SYSTEM_NAME}")
 endif()
diff --git a/depends/common/xrick/xrick.txt b/depends/common/xrick/xrick.txt
index 6bd7f06..6d6852a 100644
--- a/depends/common/xrick/xrick.txt
+++ b/depends/common/xrick/xrick.txt
@@ -1 +1 @@
-xrick https://github.com/libretro/xrick-libretro/archive/58e544ee8de08ca8421e97c064d52ef6cdd73bd2.tar.gz
+xrick https://github.com/libretro/xrick-libretro/archive/fc1f9aa00523fd722caba0f2ef085f1df0ee906d.tar.gz
diff --git a/game.libretro.xrick/addon.xml.in b/game.libretro.xrick/addon.xml.in
index 7da2695..e5003ce 100644
--- a/game.libretro.xrick/addon.xml.in
+++ b/game.libretro.xrick/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon id="game.libretro.xrick"
 		name="Rick Dangerous (XRick)"
-		version="0.21212.0.41"
+		version="0.21212.0.42"
 		provider-name="">
 	<requires>
 		<import addon="game.libretro" version="1.0.0"/>
diff --git a/game.libretro.xrick/resources/language/resource.language.en_gb/strings.po b/game.libretro.xrick/resources/language/resource.language.en_gb/strings.po
index a7213f2..5a8d39f 100644
--- a/game.libretro.xrick/resources/language/resource.language.en_gb/strings.po
+++ b/game.libretro.xrick/resources/language/resource.language.en_gb/strings.po
@@ -24,9 +24,7 @@ msgctxt "Addon Description"
 msgid "XRick is an open source implementation of the legendary game [I]Rick Dangerous[/I]."
 msgstr ""
 
-msgctxt "#30000"
-msgid "Settings"
-msgstr ""
+# Empty string with ID 30000
 
 msgctxt "#30001"
 msgid "Crop Borders"
diff --git a/game.libretro.xrick/resources/settings.xml b/game.libretro.xrick/resources/settings.xml
index 844d22a..2c59699 100644
--- a/game.libretro.xrick/resources/settings.xml
+++ b/game.libretro.xrick/resources/settings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <settings>
-	<category label="30000">
+	<category label="128">
 		<setting label="30001" type="select" id="xrick_crop_borders" values="enabled|disabled" default="enabled"/>
 		<setting label="30002" type="select" id="xrick_cheat1" values="disabled|enabled" default="disabled"/>
 		<setting label="30003" type="select" id="xrick_cheat2" values="disabled|enabled" default="disabled"/>