CANFAR theme layout addition
Conflict fix.