Effects + particle system rework