Shuffle settings
Update file js
Merge branch 's3'