The classical Buscher rules describe T-duality for metrics and B-fields in a topologically trivial setting. On the other hand, topological T-duality addresses aspects of non-trivial topology while neglecting metrics and B-fields. In this talk I will describe a new unifying framework for both aspects, based on my recent paper arxiv:2207.11799.