@joshleibsly The only thing I'm worried about here is UIAppearance not calling these in the right order. As long as you've tested setting both of these with UIAppearance and it works correctly, this looks good to merge.