Ensuring toolbar is colored appropriately #484