DNN-6166 More changes from "skin" to "theme"