UI options now use underscores