Trying to merge notification support code with multiple theme support code.