@jonmsterling One thing I don't like about this solution is that I strongly prefer the "nameinlink" behavior of making the entire "Definition N" string a hyperlink and not only "N". Of course you could roll this yourself with some macros but things start to get complicated.