Re-ordered 'cairo' components