Update sass with color and border variables. Organize into more logical flow