fix various theme issues