I just wanted to share my own personal adaptation of Onni's masterpiece mod, CivWillard. It seems that he has vanished (temporarily, I hope) from the modding scene, so I decided to adapt his code to the new information available in G&K.
All credits to Onni, of course, but some little to my efforts in making this work for G&K.
I am happy to share it with you, with only one condition: that it cannot be uploaded to Civfanatics. I have been misstreated there to an unacceptable extent by some mods that have some type of neonazi delusion of grandeur, so I don't want any effort of mine to add to their status. Please respect that simple desire.
The adaptation is working well for me, so I assume it will for you too. If you have some problems, let me know here and I will see what I can do.
EDIT: added v1.2 for some refinements
EDIT: replaced by v1.21 (COLOR_ORANGE was not working for HOSTILE, now it works)