diff --git a/packages/mediacenter/kodi-theme-Confluence/package.mk b/packages/mediacenter/kodi-theme-Confluence/package.mk
index 5995b3acd3..f92b49163a 100644
--- a/packages/mediacenter/kodi-theme-Confluence/package.mk
+++ b/packages/mediacenter/kodi-theme-Confluence/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="kodi-theme-Confluence"
-PKG_VERSION="14-4606179"
+PKG_VERSION="14-e7ba06f"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk
index 1ea5a9e246..ec65c93a45 100644
--- a/packages/mediacenter/kodi/package.mk
+++ b/packages/mediacenter/kodi/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="kodi"
-PKG_VERSION="14-4606179"
+PKG_VERSION="14-e7ba06f"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/projects/RPi/patches/kodi/kodi-001-helix_rpb_backports.patch b/projects/RPi/patches/kodi/kodi-001-helix_rpb_backports.patch
index e44856aca5..c35a3b0983 100644
--- a/projects/RPi/patches/kodi/kodi-001-helix_rpb_backports.patch
+++ b/projects/RPi/patches/kodi/kodi-001-helix_rpb_backports.patch
@@ -893,64 +893,6 @@ index 6dd3cf2..1f04a0b 100644
  				E4991320174E5DAD00741B6D /* GUIWrappingListContainer.cpp in Sources */,
  				E4991321174E5DAD00741B6D /* imagefactory.cpp in Sources */,
  				E4991322174E5DAD00741B6D /* IWindowManagerCallback.cpp in Sources */,
-diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj
-index aca7b82..2d735052 100644
---- a/project/VS2010Express/XBMC.vcxproj
-+++ b/project/VS2010Express/XBMC.vcxproj
-@@ -426,6 +426,7 @@
-     <ClCompile Include="..\..\xbmc\guilib\GUIFadeLabelControl.cpp" />
-     <ClCompile Include="..\..\xbmc\guilib\GUIFixedListContainer.cpp" />
-     <ClCompile Include="..\..\xbmc\guilib\GUIFont.cpp" />
-+    <ClCompile Include="..\..\xbmc\guilib\GUIFontCache.cpp" />
-     <ClCompile Include="..\..\xbmc\guilib\GUIFontManager.cpp" />
-     <ClCompile Include="..\..\xbmc\guilib\GUIFontTTF.cpp" />
-     <ClCompile Include="..\..\xbmc\guilib\GUIFontTTFDX.cpp" />
-@@ -1751,6 +1752,7 @@
-     <ClInclude Include="..\..\xbmc\guilib\GUIFadeLabelControl.h" />
-     <ClInclude Include="..\..\xbmc\guilib\GUIFixedListContainer.h" />
-     <ClInclude Include="..\..\xbmc\guilib\GUIFont.h" />
-+    <ClInclude Include="..\..\xbmc\guilib\GUIFontCache.h" />
-     <ClInclude Include="..\..\xbmc\guilib\GUIFontManager.h" />
-     <ClInclude Include="..\..\xbmc\guilib\GUIFontTTF.h" />
-     <ClInclude Include="..\..\xbmc\guilib\GUIFontTTFDX.h" />
-@@ -2552,4 +2554,4 @@
-     </VisualStudio>
-   </ProjectExtensions>
-   <Import Project="$(SolutionDir)\$(ProjectFileName).targets.user" Condition="Exists('$(SolutionDir)\$(ProjectFileName).targets.user')" />
--</Project>
-\ No newline at end of file
-+</Project>
-diff --git a/project/VS2010Express/XBMC.vcxproj.filters b/project/VS2010Express/XBMC.vcxproj.filters
-index 7603447..506b565 100644
---- a/project/VS2010Express/XBMC.vcxproj.filters
-+++ b/project/VS2010Express/XBMC.vcxproj.filters
-@@ -994,6 +994,9 @@
-     <ClCompile Include="..\..\xbmc\guilib\GUIFont.cpp">
-       <Filter>guilib</Filter>
-     </ClCompile>
-+    <ClCompile Include="..\..\xbmc\guilib\GUIFontCache.cpp">
-+      <Filter>guilib</Filter>
-+    </ClCompile>
-     <ClCompile Include="..\..\xbmc\guilib\GUIFontManager.cpp">
-       <Filter>guilib</Filter>
-     </ClCompile>
-@@ -3894,6 +3897,9 @@
-     <ClInclude Include="..\..\xbmc\guilib\GUIFont.h">
-       <Filter>guilib</Filter>
-     </ClInclude>
-+    <ClInclude Include="..\..\xbmc\guilib\GUIFontCache.h">
-+      <Filter>guilib</Filter>
-+    </ClInclude>
-     <ClInclude Include="..\..\xbmc\guilib\GUIFontManager.h">
-       <Filter>guilib</Filter>
-     </ClInclude>
-@@ -6073,4 +6079,4 @@
-       <Filter>interfaces\swig</Filter>
-     </None>
-   </ItemGroup>
--</Project>
-\ No newline at end of file
-+</Project>
 diff --git a/xbmc/guilib/GUIFontCache.cpp b/xbmc/guilib/GUIFontCache.cpp
 new file mode 100644
 index 0000000..2c72f9c
diff --git a/projects/RPi2/patches/kodi/kodi-001-helix_rpb_backports.patch b/projects/RPi2/patches/kodi/kodi-001-helix_rpb_backports.patch
index e44856aca5..c35a3b0983 100644
--- a/projects/RPi2/patches/kodi/kodi-001-helix_rpb_backports.patch
+++ b/projects/RPi2/patches/kodi/kodi-001-helix_rpb_backports.patch
@@ -893,64 +893,6 @@ index 6dd3cf2..1f04a0b 100644
  				E4991320174E5DAD00741B6D /* GUIWrappingListContainer.cpp in Sources */,
  				E4991321174E5DAD00741B6D /* imagefactory.cpp in Sources */,
  				E4991322174E5DAD00741B6D /* IWindowManagerCallback.cpp in Sources */,
-diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj
-index aca7b82..2d735052 100644
---- a/project/VS2010Express/XBMC.vcxproj
-+++ b/project/VS2010Express/XBMC.vcxproj
-@@ -426,6 +426,7 @@
-     <ClCompile Include="..\..\xbmc\guilib\GUIFadeLabelControl.cpp" />
-     <ClCompile Include="..\..\xbmc\guilib\GUIFixedListContainer.cpp" />
-     <ClCompile Include="..\..\xbmc\guilib\GUIFont.cpp" />
-+    <ClCompile Include="..\..\xbmc\guilib\GUIFontCache.cpp" />
-     <ClCompile Include="..\..\xbmc\guilib\GUIFontManager.cpp" />
-     <ClCompile Include="..\..\xbmc\guilib\GUIFontTTF.cpp" />
-     <ClCompile Include="..\..\xbmc\guilib\GUIFontTTFDX.cpp" />
-@@ -1751,6 +1752,7 @@
-     <ClInclude Include="..\..\xbmc\guilib\GUIFadeLabelControl.h" />
-     <ClInclude Include="..\..\xbmc\guilib\GUIFixedListContainer.h" />
-     <ClInclude Include="..\..\xbmc\guilib\GUIFont.h" />
-+    <ClInclude Include="..\..\xbmc\guilib\GUIFontCache.h" />
-     <ClInclude Include="..\..\xbmc\guilib\GUIFontManager.h" />
-     <ClInclude Include="..\..\xbmc\guilib\GUIFontTTF.h" />
-     <ClInclude Include="..\..\xbmc\guilib\GUIFontTTFDX.h" />
-@@ -2552,4 +2554,4 @@
-     </VisualStudio>
-   </ProjectExtensions>
-   <Import Project="$(SolutionDir)\$(ProjectFileName).targets.user" Condition="Exists('$(SolutionDir)\$(ProjectFileName).targets.user')" />
--</Project>
-\ No newline at end of file
-+</Project>
-diff --git a/project/VS2010Express/XBMC.vcxproj.filters b/project/VS2010Express/XBMC.vcxproj.filters
-index 7603447..506b565 100644
---- a/project/VS2010Express/XBMC.vcxproj.filters
-+++ b/project/VS2010Express/XBMC.vcxproj.filters
-@@ -994,6 +994,9 @@
-     <ClCompile Include="..\..\xbmc\guilib\GUIFont.cpp">
-       <Filter>guilib</Filter>
-     </ClCompile>
-+    <ClCompile Include="..\..\xbmc\guilib\GUIFontCache.cpp">
-+      <Filter>guilib</Filter>
-+    </ClCompile>
-     <ClCompile Include="..\..\xbmc\guilib\GUIFontManager.cpp">
-       <Filter>guilib</Filter>
-     </ClCompile>
-@@ -3894,6 +3897,9 @@
-     <ClInclude Include="..\..\xbmc\guilib\GUIFont.h">
-       <Filter>guilib</Filter>
-     </ClInclude>
-+    <ClInclude Include="..\..\xbmc\guilib\GUIFontCache.h">
-+      <Filter>guilib</Filter>
-+    </ClInclude>
-     <ClInclude Include="..\..\xbmc\guilib\GUIFontManager.h">
-       <Filter>guilib</Filter>
-     </ClInclude>
-@@ -6073,4 +6079,4 @@
-       <Filter>interfaces\swig</Filter>
-     </None>
-   </ItemGroup>
--</Project>
-\ No newline at end of file
-+</Project>
 diff --git a/xbmc/guilib/GUIFontCache.cpp b/xbmc/guilib/GUIFontCache.cpp
 new file mode 100644
 index 0000000..2c72f9c