Fixed theme issues.