So another quick update to the style. I like this better. The other one just had too many colors happening and boxes and things set apart. This has much more flow by my eye, yet everything is still distinct.
I have template backups for both of these styles, so they can switch back and for over time fairly easily.