Fix some theme-issues.