fix themesprovider and themechooser errors

themesprovider and themechooser has errors, can't build them. i tested getting them from "stable/cm-11.0" branch and all errors solved.