settings update
Merge branch 'dark'

* dark:
  settings update