Get rid of unneeded Alarm class
Simplify theming