Fix non-overridable variables in base adapter
Default color tweaks for more muted baseline
Merge branch 'master' into gh-pages