DNN-6166 More changes from "skin" to "theme"
Merge branch bdukes/DNN-6166 into development with small modification to one text