Fixed some theme inheritance issues.