Removed I2P and salsa from table and reordered the entries according to appearence of the chapters