YAMJ and XBMC are different enough that putting options for both in the same app is probably going to lead to headaches... a seperate YAMJ branch would probably be better...
Kodi: Kodi 17.4, with Transparency! 50 TB Unraid Server:Docker Apps: SABnzbd, Sickrage, mariaDB HTPC: Win10 (cause Steam), i7, GTX 1080 Watching on: Panasonic TC65-PS64 with lowend Sony 5.1 HTIB Other devices: rMBP 15", MBA 13", nvidia shield