Fix XML validity
Switch to CIDE
Fix CIDE
From CIDE
Add some unrecognized entities
Fix CIDE 2