The change suggested by @niemeyer sounds fine to me. I doubt there is going to be an incompatible theme format for GTK 3 (since we’re up to GTK 3.22, and 4.0 is on the horizon), but it could help keep things organised with past or future theme formats.
As we don’t have auto-connection approved yet, now is the time to make the change if we’re going to do it.