diff --git a/packages/addons/skin/estouchy/package.mk b/packages/addons/skin/estouchy/package.mk
new file mode 100644
index 0000000000..b9549e9744
--- /dev/null
+++ b/packages/addons/skin/estouchy/package.mk
@@ -0,0 +1,48 @@
+################################################################################
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2016 Team LibreELEC
+#
+#  LibreELEC is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  LibreELEC is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="estouchy"
+PKG_VERSION="1.0"
+PKG_REV="100"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.kodi.tv"
+PKG_URL=""
+PKG_DEPENDS_TARGET="toolchain kodi"
+PKG_PRIORITY="optional"
+PKG_SECTION="skin"
+PKG_SHORTDESC="Kodi skin Estouchy"
+PKG_LONGDESC="Kodi skin Estouchy"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_NAME="Estouchy"
+PKG_ADDON_TYPE="xbmc.gui.skin"
+PKG_AUTORECONF="no"
+
+make_target() {
+  : # already build with kodi
+}
+
+makeinstall_target() {
+  : # nothing to install
+}
+
+addon() {
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
+    cp -a $(get_build_dir kodi)/.$TARGET_NAME/addons/skin.estouchy/* $ADDON_BUILD/$PKG_ADDON_ID
+}
diff --git a/packages/mediacenter/kodi-theme-Estuary/package.mk b/packages/mediacenter/kodi-theme-Estuary/package.mk
index 5ef258fb2d..35661e8f36 100644
--- a/packages/mediacenter/kodi-theme-Estuary/package.mk
+++ b/packages/mediacenter/kodi-theme-Estuary/package.mk
@@ -17,12 +17,12 @@
 ################################################################################
 
 PKG_NAME="kodi-theme-Estuary"
-PKG_VERSION="17.0-beta7-eed32e7"
+PKG_VERSION="1.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.kodi.tv"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL=""
 PKG_DEPENDS_TARGET="toolchain kodi"
 PKG_SECTION="mediacenter"
 PKG_SHORTDESC="kodi-theme-Estuary: Kodi Mediacenter default theme"
@@ -32,28 +32,10 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
 make_target() {
-  TexturePacker -input media/ \
-                -output Textures.xbt \
-                -dupecheck \
-                -use_none
-
-  for theme in themes/*; do
-    TexturePacker -input $theme \
-                -output $(basename $theme).xbt \
-                -dupecheck
-  done
+  :
 }
 
 makeinstall_target() {
-  mkdir -p $INSTALL/usr/share/kodi/addons/skin.estuary
-    cp -R */ $INSTALL/usr/share/kodi/addons/skin.estuary
-    cp *.txt $INSTALL/usr/share/kodi/addons/skin.estuary
-    cp *.xml $INSTALL/usr/share/kodi/addons/skin.estuary
-      rm -rf $INSTALL/usr/share/kodi/addons/skin.estuary/media
-
-  mkdir -p $INSTALL/usr/share/kodi/addons/skin.estuary/media
-    cp Textures.xbt $INSTALL/usr/share/kodi/addons/skin.estuary/media
-    for theme in themes/*; do
-      cp $(basename $theme).xbt $INSTALL/usr/share/kodi/addons/skin.estuary/media
-    done
+  mkdir -p $INSTALL/usr/share/kodi/addons/
+    cp -a $(get_build_dir kodi)/.$TARGET_NAME/addons/skin.estuary $INSTALL/usr/share/kodi/addons/
 }
diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk
index cb51b7b0bd..27d3f39592 100644
--- a/packages/mediacenter/kodi/package.mk
+++ b/packages/mediacenter/kodi/package.mk
@@ -17,12 +17,13 @@
 ################################################################################
 
 PKG_NAME="kodi"
-PKG_VERSION="17.0-beta7-eed32e7"
+PKG_VERSION="eed32e7"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.kodi.tv"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="https://github.com/xbmc/xbmc/archive/$PKG_VERSION.tar.gz"
+PKG_SOURCE_DIR="xbmc-$PKG_VERSION*"
 PKG_DEPENDS_TARGET="toolchain JsonSchemaBuilder:host TexturePacker:host xmlstarlet:host Python zlib systemd pciutils lzo pcre swig:host libass curl fontconfig fribidi tinyxml libjpeg-turbo freetype libcdio taglib libxml2 libxslt yajl sqlite ffmpeg crossguid giflib libdvdnav libhdhomerun"
 PKG_SECTION="mediacenter"
 PKG_SHORTDESC="kodi: Kodi Mediacenter"
@@ -258,6 +259,7 @@ post_makeinstall_target() {
   rm -rf $INSTALL/usr/share/icons
   rm -rf $INSTALL/usr/share/pixmaps
   rm -rf $INSTALL/usr/share/kodi/addons/skin.estouchy
+  rm -rf $INSTALL/usr/share/kodi/addons/skin.estuary
   rm -rf $INSTALL/usr/share/kodi/addons/service.xbmc.versioncheck
   rm -rf $INSTALL/usr/share/kodi/addons/visualization.vortex
   rm -rf $INSTALL/usr/share/xsessions
diff --git a/packages/mediacenter/kodi/patches/kodi-100.21-remove-texture-packer.patch b/packages/mediacenter/kodi/patches/kodi-100.21-remove-texture-packer.patch
deleted file mode 100644
index 8095c1e073..0000000000
--- a/packages/mediacenter/kodi/patches/kodi-100.21-remove-texture-packer.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Naur a/project/cmake/CMakeLists.txt b/project/cmake/CMakeLists.txt
---- a/project/cmake/CMakeLists.txt	2016-11-30 20:56:15.081681608 -0800
-+++ b/project/cmake/CMakeLists.txt	2016-11-30 20:57:19.179297961 -0800
-@@ -283,10 +283,6 @@
-   copy_skin_to_buildtree(${dir} ${relative})
- endforeach()
- 
--add_custom_target(pack-skins ALL
--                  DEPENDS TexturePacker::TexturePacker export-files ${XBT_FILES})
--set_target_properties(pack-skins PROPERTIES FOLDER "Build Utilities")
--
- file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/system/players/VideoPlayer)
- 
- set(LIBCEC_SONAME "${CEC_SONAME}")
-@@ -330,7 +326,7 @@
-   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
-   add_library(${APP_NAME_LC} SHARED ${CORE_MAIN_SOURCE} "${RESOURCES}" ${OTHER_FILES})
- endif()
--add_dependencies(${APP_NAME_LC} ${APP_NAME_LC}-libraries export-files pack-skins)
-+add_dependencies(${APP_NAME_LC} ${APP_NAME_LC}-libraries export-files)
- whole_archive(_MAIN_LIBRARIES ${core_DEPENDS})
- target_link_libraries(${APP_NAME_LC} ${_MAIN_LIBRARIES} lib${APP_NAME_LC} ${DEPLIBS})
- unset(_MAIN_LIBRARIES)
diff --git a/packages/mediacenter/kodi/patches/kodi-100.22-dont-touch-skins.patch b/packages/mediacenter/kodi/patches/kodi-100.22-dont-touch-skins.patch
deleted file mode 100644
index 1fed83fb4e..0000000000
--- a/packages/mediacenter/kodi/patches/kodi-100.22-dont-touch-skins.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -Naur a/project/cmake/CMakeLists.txt b/project/cmake/CMakeLists.txt
---- a/project/cmake/CMakeLists.txt	2016-11-30 21:02:11.947113135 -0800
-+++ b/project/cmake/CMakeLists.txt	2016-11-30 21:02:41.399396354 -0800
-@@ -273,16 +273,6 @@
- copy_files_from_filelist_to_buildtree(${PROJECT_SOURCE_DIR}/installdata/common/*.txt
-                                       ${PROJECT_SOURCE_DIR}/installdata/${CORE_SYSTEM_NAME}/*.txt)
- 
--list(APPEND SKINS "${CORE_SOURCE_DIR}/addons/skin.estuary\;${CORE_SOURCE_DIR}")
--list(APPEND SKINS "${CORE_SOURCE_DIR}/addons/skin.estouchy\;${CORE_SOURCE_DIR}")
--
--# These are skins that are copied into place from the source tree
--foreach(skin ${SKINS})
--  list(GET skin 0 dir)
--  list(GET skin 1 relative)
--  copy_skin_to_buildtree(${dir} ${relative})
--endforeach()
--
- file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/system/players/VideoPlayer)
- 
- set(LIBCEC_SONAME "${CEC_SONAME}")
-diff -Naur a/project/cmake/scripts/linux/Install.cmake b/project/cmake/scripts/linux/Install.cmake
---- a/project/cmake/scripts/linux/Install.cmake	2016-11-30 21:02:11.951113174 -0800
-+++ b/project/cmake/scripts/linux/Install.cmake	2016-11-30 21:02:50.984488519 -0800
-@@ -307,15 +307,6 @@
-         DESTINATION ${includedir}/${APP_NAME_LC}
-         COMPONENT kodi-peripheral-dev)
- 
--# Install XBT skin files
--foreach(texture ${XBT_FILES})
--  string(REPLACE "${CMAKE_BINARY_DIR}/" "" dir ${texture})
--  get_filename_component(dir ${dir} DIRECTORY)
--  install(FILES ${texture}
--          DESTINATION ${datarootdir}/${APP_NAME_LC}/${dir}
--          COMPONENT kodi)
--endforeach()
--
- # Install extra stuff if it exists
- if(EXISTS ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/extra-installs)
-   install(CODE "file(STRINGS ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/extra-installs dirs)
diff --git a/tools/mkpkg/mkpkg_kodi b/tools/mkpkg/mkpkg_kodi
deleted file mode 100755
index 963ba85f29..0000000000
--- a/tools/mkpkg/mkpkg_kodi
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/sh
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  OpenELEC is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-if [ -z "$1" ]; then
-  echo "Usage: $0 <branch-name> [git-rev]"
-  exit 0
-fi
-
-PKG_NAME="kodi"
-PKG_VERSION=""
-BRANCH="$1"
-GIT_REV="$2"
-GIT_REPO="git://github.com/xbmc/xbmc.git"
-DEST_DIR="$PKG_NAME-$BRANCH"
-
-echo "getting sources..."
-  if [ ! -d $DEST_DIR.git ]; then
-    git clone --depth 128 $GIT_REPO -b $BRANCH $DEST_DIR.git
-  fi
-
-  cd $DEST_DIR.git
-  git pull
-
-  # use a specific git rev, rather than HEAD
-  [ -n "$GIT_REV" ] && git reset --hard $GIT_REV
-
-echo "getting version..."
-  GIT_HASH=`git log -n1 --format=%h`
-  VERSION_MAJOR=$(grep ^VERSION_MAJOR version.txt | cut -d" " -f2)
-  VERSION_MINOR=$(grep ^VERSION_MINOR version.txt | cut -d" " -f2)
-  VERSION_TAG=$(grep ^VERSION_TAG version.txt | cut -d" " -f2 | tr A-Z a-z)
-  PKG_VERSION="$VERSION_MAJOR.$VERSION_MINOR-$VERSION_TAG-$GIT_HASH"
-  # hack: empty version tag on release builds:
-  if [ "$VERSION_TAG" = "version_tag" ] ; then
-    PKG_VERSION="$VERSION_MAJOR.$VERSION_MINOR-$GIT_HASH"
-  fi
-  echo $PKG_VERSION
-  cd ..
-
-echo "copying sources..."
-  rm -rf $PKG_NAME-$PKG_VERSION
-  cp -R $DEST_DIR.git $PKG_NAME-$PKG_VERSION
-  echo "$GIT_HASH" > $PKG_NAME-$PKG_VERSION/VERSION
-
-echo "cleaning sources..."
-  rm -rf $PKG_NAME-$PKG_VERSION/.git
-
-echo "seperating theme..."
-  rm -rf $PKG_NAME-theme-Estuary-$PKG_VERSION
-  mv $PKG_NAME-$PKG_VERSION/addons/skin.estuary $PKG_NAME-theme-Estuary-$PKG_VERSION
-
-echo "packing sources..."
-  tar cvJf $PKG_NAME-$PKG_VERSION.tar.xz $PKG_NAME-$PKG_VERSION
-  tar cvJf $PKG_NAME-theme-Estuary-$PKG_VERSION.tar.xz $PKG_NAME-theme-Estuary-$PKG_VERSION
-
-echo "remove temporary sourcedir..."
-  rm -rf $PKG_NAME-$PKG_VERSION
-  rm -rf $PKG_NAME-theme-Estuary-$PKG_VERSION