There's a 5 day old PR open that changes quite a bit in this file as well. I think that one should be merged first as it consolidates a bunch of things. https://github.com/sakaiproject/3akai-ux/pull/2754/files#diff-23