TE Round 2 same as Round 1?

Is the layout the same between these two, as far as button and joystick placement.

I am asking to know if templates for the Round 1 will work for the Round 2 as well button replacement.

Also, is there any upgrade to the hardware? The only difference I can see between the two is one having black borders and one having white. Everything else looks identical.

Thanks

pretty much exactly as you said. no differences except the wings. yes the panels will fit. all panels ( R1TE/R2TE/TE-S/TE-S Chun Li E. ) are universal.