Fixed #1 adding color varable and black color class
Rearranged varables to have most important near top