Kodi Krypton Tomb Raider – skin keep menu

Hi I hope there is an easy way to keep all my menu settings if I update my skin.

I ran a fresh install of Kodi Krypton and then installed the Tomb Raider build I have found how to use the textures for the theme but I would like to use the default Aon.Nox theme but keep all the current modifications is this possible or will I need to build the menu myself?

Also does anyone know why themes do not use this as standard for the exit Kodi button

<onclick>System.Exec (“taskkill.exe /im Kodi.exe /f”)</onclick>

This works as expected, yet all skins still use Quit() which just hangs

thanks

Mike