XWIKI-1342: Colibri theme - diff + removed amelia theme since incompatibility with the colors