Mastering the modern Benoni and the Benko Gambit