Refactoring ore tables; optimal highlighting is still off.