A discussion in another thread has me thinking on the subject of contemporary Gaelic dictionaries. For out-of-the-everyday words I tend to default to Dwelly's, MacLennan, and An Stòr-dàta Briathrachais Gàidhlig, which refers back to the older dictionaries as well. What do you use for the most contemporary Gaelic dictionary? Is there a current dictionary that reflects contemporary usage, orthography and etymology? Please note, I do mean a proper dictionary, not a phrase book. Especially hoping to hear from native speakers and scholars.

Many thanks!