Added GXT2, other stuff