added solid color borders

and cleaned up some syntax for easier editing