Themes and access modifier fixes.