fix various theme