Minor theme refactorings