The toolbar border color can now be set. Cleaned up the code a bit.