Remove unused styles
Fix alarm bug
Merge remote-tracking branch 'origin/master' into swiping2
wip
Wip