Added notification theming
Resolved merge conflict