Tweak scroll hint animation
Merge branch 'custom'
Merge branch 'modular'