Some header changes, consolidated some colors & values to variables, added more button styles.