Okay, so I spent a good couple of hours seeing what I could do to help ease compatibility between EUI and the CBP, and I come bearing fixes for the most immediate problems which make EUI and CBP unplayable. CityBannerManager.lua updated for the latest EU version. Without it, the CityBanner does not load properly. TradeLogic.lua updated for the latest EU version. This is the CIV Diplomacy version. The most important thing, however, is for Gazebo: the CityView.lua file should be removed from the mod, and replaced with this file, which needs to be added as an InGameUIAddin. This does the same thing as did the replacement cityview file, but without the obvious incompatibilities. The TopPanel.lua file has too many changes to effectively combine it with EUI's version, and doesn't cause any issues when EUI's is overwritten by default. That, and I need to finish my dynamic top panel replacer before even thinking about it. And the CityStateStatusHelper file I couldn't do much about, as the EUI version doesn't differentiate between the status tooltip text and the description text, unlike CBP. However, there are no major issues with just letting the CBP version overwrite the EUI version. Also, don't get lax on commenting where you've made edits to vanilla files (none in SocialPolicyPopup); makes it a slower process to try and find the changes otherwise.