diff -Nru kodi-screensaver-stars-2.1.2/appveyor.yml kodi-screensaver-stars-2.1.3/appveyor.yml
--- kodi-screensaver-stars-2.1.2/appveyor.yml	2019-03-20 01:13:35.000000000 +0000
+++ kodi-screensaver-stars-2.1.3/appveyor.yml	2019-12-17 12:59:47.000000000 +0000
@@ -1,6 +1,6 @@
 version: BuildNr.{build}
 
-image: Visual Studio 2015
+image: Visual Studio 2017
 
 shallow_clone: true
 
@@ -10,20 +10,20 @@
   app_id: screensaver.stars
 
   matrix:
-    - GENERATOR: "Visual Studio 14"
+    - GENERATOR: "Visual Studio 15"
       CONFIG: Release
-    - GENERATOR: "Visual Studio 14 Win64"
+    - GENERATOR: "Visual Studio 15 Win64"
       CONFIG: Release
-    - GENERATOR: "Visual Studio 14 Win64"
+    - GENERATOR: "Visual Studio 15 Win64"
       CONFIG: Release
       WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.16299.0"
-    - GENERATOR: "Visual Studio 14 ARM"
+    - GENERATOR: "Visual Studio 15 ARM"
       CONFIG: Release
       WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.16299.0"
 
 build_script:
   - cd ..
-  - git clone --depth=1 https://github.com/xbmc/xbmc.git
+  - git clone --branch Leia --depth=1 https://github.com/xbmc/xbmc.git
   - cd %app_id%
   - mkdir build
   - cd build
diff -Nru kodi-screensaver-stars-2.1.2/debian/changelog kodi-screensaver-stars-2.1.3/debian/changelog
--- kodi-screensaver-stars-2.1.2/debian/changelog	2013-05-31 22:59:22.000000000 +0000
+++ kodi-screensaver-stars-2.1.3/debian/changelog	2013-05-31 22:59:22.000000000 +0000
@@ -1,4 +1,4 @@
-kodi-screensaver-stars (2.1.2-1~xenial) xenial; urgency=low
+kodi-screensaver-stars (2.1.3-1~xenial) xenial; urgency=low
 
   [ kodi ]
   * autogenerated dummy changelog
diff -Nru kodi-screensaver-stars-2.1.2/FindOpenGLES.cmake kodi-screensaver-stars-2.1.3/FindOpenGLES.cmake
--- kodi-screensaver-stars-2.1.2/FindOpenGLES.cmake	2019-03-20 01:13:35.000000000 +0000
+++ kodi-screensaver-stars-2.1.3/FindOpenGLES.cmake	2019-12-17 12:59:47.000000000 +0000
@@ -1,9 +1,9 @@
 #.rst:
 # FindOpenGLES
 # ------------
-# Finds the OpenGLES2 library
+# Finds the OpenGLES2 and OpenGLES3 library
 #
-# This will define the following variables::
+# This will define the following variables:
 #
 # OPENGLES_FOUND - system has OpenGLES
 # OPENGLES_INCLUDE_DIRS - the OpenGLES include directory
@@ -18,7 +18,8 @@
   pkg_check_modules(PC_OPENGLES ${_brcmprefix}glesv2 QUIET)
 endif()
 
-if(NOT CORE_SYSTEM_NAME STREQUAL ios)
+if(NOT CORE_SYSTEM_NAME STREQUAL darwin_embedded AND
+   NOT CORE_SYSTEM_NAME STREQUAL ios)
   find_path(OPENGLES_INCLUDE_DIR GLES2/gl2.h
                                  PATHS ${PC_OPENGLES_INCLUDEDIR})
   find_library(OPENGLES_gl_LIBRARY NAMES ${_brcmprefix}GLESv2
diff -Nru kodi-screensaver-stars-2.1.2/Jenkinsfile kodi-screensaver-stars-2.1.3/Jenkinsfile
--- kodi-screensaver-stars-2.1.2/Jenkinsfile	2019-03-20 01:13:35.000000000 +0000
+++ kodi-screensaver-stars-2.1.3/Jenkinsfile	2019-12-17 12:59:47.000000000 +0000
@@ -1 +1 @@
-buildPlugin()
+buildPlugin(version: "Leia")
diff -Nru kodi-screensaver-stars-2.1.2/README.md kodi-screensaver-stars-2.1.3/README.md
--- kodi-screensaver-stars-2.1.2/README.md	2019-03-20 01:13:35.000000000 +0000
+++ kodi-screensaver-stars-2.1.3/README.md	2019-12-17 12:59:47.000000000 +0000
@@ -16,7 +16,7 @@
 The following instructions assume you will have built Kodi already in the `kodi-build` directory 
 suggested by the README.
 
-1. `git clone https://github.com/xbmc/xbmc.git`
+1. `git clone --branch Leia https://github.com/xbmc/xbmc.git`
 2. `git clone https://github.com/xbmc/screensaver.stars.git`
 3. `cd screensaver.stars && mkdir build && cd build`
 4. `cmake -DADDONS_TO_BUILD=screensaver.stars -DADDON_SRC_PREFIX=../.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../../xbmc/kodi-build/addons -DPACKAGE_ZIP=1 ../../xbmc/cmake/addons`
diff -Nru kodi-screensaver-stars-2.1.2/screensaver.stars/addon.xml.in kodi-screensaver-stars-2.1.3/screensaver.stars/addon.xml.in
--- kodi-screensaver-stars-2.1.2/screensaver.stars/addon.xml.in	2019-03-20 01:13:35.000000000 +0000
+++ kodi-screensaver-stars-2.1.3/screensaver.stars/addon.xml.in	2019-12-17 12:59:47.000000000 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="screensaver.stars"
-  version="2.1.2"
+  version="2.1.3"
   name="Stars"
   provider-name="Team Kodi">
   <requires>@ADDON_DEPENDS@</requires>
@@ -12,6 +12,8 @@
     <summary>Stars screensaver</summary>
     <description>A screensaver that lets you fly through the stars.</description>
     <platform>@PLATFORM@</platform>
+    <license>GPL-2.0</license>
+    <source>https://github.com/xbmc/visualization.stars</source>
     <assets>
       <icon>resources/icon.png</icon>
       <fanart>resources/fanart.png</fanart>
diff -Nru kodi-screensaver-stars-2.1.2/screensaver.stars/resources/settings.xml kodi-screensaver-stars-2.1.3/screensaver.stars/resources/settings.xml
--- kodi-screensaver-stars-2.1.2/screensaver.stars/resources/settings.xml	2019-03-20 01:13:35.000000000 +0000
+++ kodi-screensaver-stars-2.1.3/screensaver.stars/resources/settings.xml	2019-12-17 12:59:47.000000000 +0000
@@ -1,8 +1,64 @@
-<settings>
-  <setting id="numstars"   label="30000" type="slider" option="int" range="1000,1000,20000" default="8000"/>
-  <setting id="gamma"      label="30001" type="slider" option="float" range="0.01,0.01,2.0" default="1.0"/>
-  <setting id="brightness" label="30002" type="slider" option="float" range="0.01,0.01,1.0" default="0.2"/>
-  <setting id="speed"      label="30003" type="slider" option="float" range="1,0.1,50" default="20.0"/>
-  <setting id="zoom"       label="30004" type="slider" option="float" range="0.1,0.1,10.0" default="1.0"/>
-  <setting id="expanse"    label="30005" type="slider" option="float" range="0.1,0.1,10.0" default="1.5"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<settings version="1">
+  <section id="addon" label="0" help="0">
+    <category id="main" label="128" help="0">
+      <group id="1" label="0">
+        <setting id="numstars" type="integer" label="30000" help="0">
+          <default>8000</default>
+          <constraints>
+            <minimum>1000</minimum>
+            <step>1000</step>
+            <maximum>20000</maximum>
+          </constraints>
+          <control type="slider" format="integer"/>
+        </setting>
+        <setting id="gamma" type="number" label="30001" help="0">
+          <default>1.0</default>
+          <constraints>
+            <minimum>0.01</minimum>
+            <step>0.01</step>
+            <maximum>2.0</maximum>
+          </constraints>
+          <control type="slider" format="number"/>
+        </setting>
+        <setting id="brightness" type="number" label="30002" help="0">
+          <default>0.2</default>
+          <constraints>
+            <minimum>0.01</minimum>
+            <step>0.01</step>
+            <maximum>1.0</maximum>
+          </constraints>
+          <control type="slider" format="number"/>
+        </setting>
+        <setting id="speed" type="number" label="30003" help="0">
+          <default>20.0</default>
+          <constraints>
+            <minimum>1.0</minimum>
+            <step>0.1</step>
+            <maximum>50.0</maximum>
+          </constraints>
+          <control type="slider" format="number"/>
+        </setting>
+        <setting id="zoom" type="number" label="30004" help="0">
+          <default>1.0</default>
+          <constraints>
+            <minimum>0.1</minimum>
+            <step>0.1</step>
+            <maximum>10.0</maximum>
+          </constraints>
+          <control type="slider" format="number"/>
+        </setting>
+        <setting id="expanse" type="number" label="30005" help="0">
+          <default>1.5</default>
+          <constraints>
+            <minimum>0.1</minimum>
+            <step>0.1</step>
+            <maximum>10.0</maximum>
+          </constraints>
+          <control type="slider" format="number"/>
+        </setting>
+      </group>
+    </category>
+  </section>
 </settings>
+
diff -Nru kodi-screensaver-stars-2.1.2/src/StarField.cpp kodi-screensaver-stars-2.1.3/src/StarField.cpp
--- kodi-screensaver-stars-2.1.2/src/StarField.cpp	2019-03-20 01:13:35.000000000 +0000
+++ kodi-screensaver-stars-2.1.3/src/StarField.cpp	2019-12-17 12:59:47.000000000 +0000
@@ -6,6 +6,7 @@
 #include <stdio.h>
 #include <memory.h>
 #include <algorithm>
+#include <stddef.h>
 
 const int POINTSPERSTAR = 2;
 
diff -Nru kodi-screensaver-stars-2.1.2/src/Stars.cpp kodi-screensaver-stars-2.1.3/src/Stars.cpp
--- kodi-screensaver-stars-2.1.2/src/Stars.cpp	2019-03-20 01:13:35.000000000 +0000
+++ kodi-screensaver-stars-2.1.3/src/Stars.cpp	2019-12-17 12:59:47.000000000 +0000
@@ -48,9 +48,9 @@
 public:
   CScreensaverStars();
 
-  virtual bool Start() override;
-  virtual void Stop() override;
-  virtual void Render() override;
+  bool Start() override;
+  void Stop() override;
+  void Render() override;
 
 private:
   ST_SETTINGS m_Settings;
diff -Nru kodi-screensaver-stars-2.1.2/.travis.yml kodi-screensaver-stars-2.1.3/.travis.yml
--- kodi-screensaver-stars-2.1.2/.travis.yml	2019-03-20 01:13:35.000000000 +0000
+++ kodi-screensaver-stars-2.1.3/.travis.yml	2019-12-17 12:59:47.000000000 +0000
@@ -33,7 +33,7 @@
 #
 before_script:
   - cd $TRAVIS_BUILD_DIR/..
-  - git clone --depth=1 https://github.com/xbmc/xbmc.git
+  - git clone --branch Leia --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