Make settings chooser and theme chooser consistent

Closes #292