rename the navbar-inverse-brand variables for consistency
rename btn bg variables so that they are consistent with the other variables
Merge remote-tracking branch 'upstream/3.0.0-wip' into 3.0.0-wip
hopefully fixed messed up stylesheet...
Merge pull request #7504 from acmetech/3.0.0-wip

variable update - fixed