Can someone spoil me I'm only at ch.18 did they switch back or not?

Yes, at some point they do.

.
.
.
.
.
.
.
.
.
.
.
.

They do ! (≧∀≦)
It's really really great ! If you continue reading, I hope you'll like it !

P.S. : that profil picture had me WHEEZE, i can't even