Merge "Fix NIC colors not applying correctly" into main