Fix more whitespace, and improve more naming.

I see Noufal realigned all the template var dicts, giving them wider columns to accomodate his long key name. Per PEP 8 and my preference, cut all that stuff down to single spaces so it's easy to edit in the future.
Merge pathname breadcrumbs. Fix #130. Fixes 758628.