custom prefs
Merge branch 'boris-custom'
update personal config