I've integrated EasySocial and JA Social ii

I made an almost complete copy of:

public_html/components/com_easysocial/themes/wireframe

and placed it under:

public_html/templates/ja_social_ii/html/com_easysocial

I've made a lot of customizations, for example the toolbar, users directory (for user listing), customized emails, etc.

What I would like to know is, whenever there is a EasySocial upgrade in the future, will it be overwritten? Are my customizations safe here?

If not, could you please tell me where, or how I should implement my customizations so they are upgrade-proof? Up until now they survived an upgrade...

what is the best way to also upgrade any customized files with the latest EasySocial code?

--Jan