A song more in the encores is already ok!
I agree for change position of some song and put theme in the encores!

I hope this is understandable that I wrote!