diff -Nru kodi-game-libretro-bluemsx-0.0.1.11/appveyor.yml kodi-game-libretro-bluemsx-0.0.1.16/appveyor.yml
--- kodi-game-libretro-bluemsx-0.0.1.11/appveyor.yml	2013-05-31 22:59:22.000000000 +0000
+++ kodi-game-libretro-bluemsx-0.0.1.16/appveyor.yml	2013-05-31 22:59:22.000000000 +0000
@@ -14,10 +14,16 @@
       CONFIGURATION: Release
     - GENERATOR: "Visual Studio 15 Win64"
       CONFIGURATION: Release
+    - GENERATOR: "Visual Studio 15 Win64"
+      CONFIG: Release
+      WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0"
+    - GENERATOR: "Visual Studio 15 ARM"
+      CONFIG: Release
+      WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0"
 
 build_script:
   - cd ..
-  - git clone --branch Leia --depth=1 https://github.com/xbmc/xbmc.git
+  - git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git
   - mklink /j xbmc\project\BuildDependencies\msys64 C:\msys64
   - cd %app_id%
   - mkdir build
@@ -25,5 +31,5 @@
   - mkdir -p definition\%app_id%
   - echo %app_id% %APPVEYOR_BUILD_FOLDER% %APPVEYOR_REPO_COMMIT% > definition\%app_id%\%app_id%.txt
   - SET PATH=C:\Program Files (x86)\CMake\bin;C:\msys64\bin;C:\msys64\usr\bin;%PATH%
-  - cmake -T host=x64 -G "%GENERATOR%" -DADDONS_TO_BUILD=%app_id% -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DADDONS_DEFINITION_DIR=%APPVEYOR_BUILD_FOLDER%/build/definition -DADDON_SRC_PREFIX=../.. -DCMAKE_INSTALL_PREFIX=../../xbmc/addons -DPACKAGE_ZIP=1 ../../xbmc/cmake/addons
+  - cmake -T host=x64 -G "%GENERATOR%" %WINSTORE% -DADDONS_TO_BUILD=%app_id% -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DADDONS_DEFINITION_DIR=%APPVEYOR_BUILD_FOLDER%/build/definition -DADDON_SRC_PREFIX=../.. -DCMAKE_INSTALL_PREFIX=../../xbmc/addons -DPACKAGE_ZIP=1 ../../xbmc/cmake/addons
   - cmake --build . --config %CONFIGURATION% --target %app_id%
diff -Nru kodi-game-libretro-bluemsx-0.0.1.11/debian/changelog kodi-game-libretro-bluemsx-0.0.1.16/debian/changelog
--- kodi-game-libretro-bluemsx-0.0.1.11/debian/changelog	2013-05-31 22:59:22.000000000 +0000
+++ kodi-game-libretro-bluemsx-0.0.1.16/debian/changelog	2013-05-31 22:59:22.000000000 +0000
@@ -1,4 +1,4 @@
-kodi-game-libretro-bluemsx (0.0.1.11-1~focal) focal; urgency=low
+kodi-game-libretro-bluemsx (0.0.1.16-1~focal) focal; urgency=low
 
   [ kodi ]
   * autogenerated dummy changelog
diff -Nru kodi-game-libretro-bluemsx-0.0.1.11/depends/common/bluemsx/bluemsx.txt kodi-game-libretro-bluemsx-0.0.1.16/depends/common/bluemsx/bluemsx.txt
--- kodi-game-libretro-bluemsx-0.0.1.11/depends/common/bluemsx/bluemsx.txt	2013-05-31 22:59:22.000000000 +0000
+++ kodi-game-libretro-bluemsx-0.0.1.16/depends/common/bluemsx/bluemsx.txt	2013-05-31 22:59:22.000000000 +0000
@@ -1 +1 @@
-bluemsx https://github.com/libretro/blueMSX-libretro/archive/1d441d908e73cf0fa7f52c42686f6c9e8cd254ed.zip
+bluemsx https://github.com/libretro/blueMSX-libretro/archive/5b8718c8bba44ff4adda1bcc575895d342c1ba6a.zip
diff -Nru kodi-game-libretro-bluemsx-0.0.1.11/game.libretro.bluemsx/addon.xml.in kodi-game-libretro-bluemsx-0.0.1.16/game.libretro.bluemsx/addon.xml.in
--- kodi-game-libretro-bluemsx-0.0.1.11/game.libretro.bluemsx/addon.xml.in	2013-05-31 22:59:22.000000000 +0000
+++ kodi-game-libretro-bluemsx-0.0.1.16/game.libretro.bluemsx/addon.xml.in	2013-05-31 22:59:22.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon id="game.libretro.bluemsx"
 		name="MSX/SVI/ColecoVision/SG-1000 (blueMSX)"
-		version="0.0.1.11"
+		version="0.0.1.16"
 		provider-name="Daniel Vik">
 	<requires>
 		<import addon="game.libretro" version="1.0.0"/>
diff -Nru kodi-game-libretro-bluemsx-0.0.1.11/Jenkinsfile kodi-game-libretro-bluemsx-0.0.1.16/Jenkinsfile
--- kodi-game-libretro-bluemsx-0.0.1.11/Jenkinsfile	2013-05-31 22:59:22.000000000 +0000
+++ kodi-game-libretro-bluemsx-0.0.1.16/Jenkinsfile	2013-05-31 22:59:22.000000000 +0000
@@ -1 +1 @@
-buildPlugin(version: "Leia", platforms: ["android-armv7", "android-aarch64", "ios-armv7", "ios-aarch64", "osx-x86_64", "ubuntu-ppa", "windows-i686", "windows-x86_64"])
+buildPlugin(version: "Matrix")
diff -Nru kodi-game-libretro-bluemsx-0.0.1.11/.travis.yml kodi-game-libretro-bluemsx-0.0.1.16/.travis.yml
--- kodi-game-libretro-bluemsx-0.0.1.11/.travis.yml	2013-05-31 22:59:22.000000000 +0000
+++ kodi-game-libretro-bluemsx-0.0.1.16/.travis.yml	2013-05-31 22:59:22.000000000 +0000
@@ -22,7 +22,7 @@
       sudo: required
       compiler: clang
     - os: osx
-      osx_image: xcode9
+      osx_image: xcode10.2
 
 #
 # The addon source is automatically checked out in $TRAVIS_BUILD_DIR,
@@ -30,7 +30,7 @@
 #
 before_script:
   - cd $TRAVIS_BUILD_DIR/..
-  - git clone --branch Leia --depth=1 https://github.com/xbmc/xbmc.git
+  - git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git
   - cd ${app_id} && mkdir build && cd build
   - mkdir -p definition/${app_id}
   - echo ${app_id} $TRAVIS_BUILD_DIR $TRAVIS_COMMIT > definition/${app_id}/${app_id}.txt