fix: for real last merge conflicts
improv: make silver a bit bigger
Merge branch 'master' into gh-pages