Dark schema: there are some minor issues left, but this one should go first