Themes fixes.