Add T initial highlights support
Complete adding T highlights support