Fixed notifications settings so they would save
Merge remote-tracking branch 'origin/master'
Labels and switches stored in structures rather than individually.