Consolidate keywords, update emails