Map Tips in Themes

I have found this issue a lot, when creating map themes. It seems that if you go through and alter map tips after your layer theme is created, that your map tips then don't show up in your layer themes( even when map tips are enabled and configured).  I check my updates to map tips by looking at the configured map tips in the " all available layers" and not the layer themes. Does anyone know why this bug occurs and how to ensure that map tips are configured the way you want them in the themes at all times, and not just when you create them for that time and place?

 

I could solve this issue by rebuilding my themes...again but that is time intensive and doesn't solve this issue of why my theme's don't update to updates in map tip configurations. 

 

Thanks for any help.

 

Raoul