Adjust colors and spacing for #36 and #37