Tweak links
Use recognizable variables
Merge branch 'staging' of github.com:scrollback/scrollback into staging