Updated x2x to new git style