New theme and alert finction changes

Updated