My friend, we have a nice tool here. Thanks for breaking out the 16u2 ICSP!
Not that it is needed, but one more thing jumped out. The I2C "extensional" pins and pins 20 and 21 could be tied "visually", but it could be a little too busy.
Good job again, I like the polarity declaration as well.