Update kit types to match server
Merge branch 'update_kit_types'