Orbit bullet color variables fix

$orbit-bullet-nav-color and $orbit-bullet-nav-color-active we're not
used anywhere so I applied them to the orbit bullets which I'm assuming
they were for.
updated conflict