Shuffle categories a bit more and add some more games