added new poof effect
added border effect
Merge branch 'feature/PS' into develop