Rainbow added, plus some more content