Update, Begin on refactoring alll toolbar styles