Add and remove scripts. Tidy and update scripts
Eluna fix merge
Fix merge