Uninstall Kodi. If possible save the add-ons/userdata folder if you can. (folder is Android/data/org.xbmc.kodi/files/.kodi/userdata/)
Install FTMC. It uses same folder for add-ons as Kodi does. It sticks to 16.1 interface but with fixes implemeneted by superceleron. Topic is here: http://freaktab.com/forum/tv-player-...lk/575588-ftmc
If you weren't able to save add-ons/userdata folder, re-install add-ons as usual.
Enjoy.
Comment