Adjusts on Colivre-themes requested by EITA