settings page, notifications modal styles
commit after merge conflicts