updating to new BS3 color variable names
Merge branch '3.x'