diff -Nur --no-dereference smeserver-wbl-0.5.0.old/createlinks smeserver-wbl-0.5.0/createlinks
--- smeserver-wbl-0.5.0.old/createlinks	2022-04-17 15:25:33.797000000 -0400
+++ smeserver-wbl-0.5.0/createlinks	2022-04-17 15:31:16.600000000 -0400
@@ -7,13 +7,26 @@
 my $panel = "manager";
 panel_link("wbl", $panel);
 
-templates2events("/var/qmail/control/badmailfrom", "email-update");
 templates2events("/var/service/qpsmtpd/config/badmailfrom", "email-update");
-templates2events("/var/service/qpsmtpd/config/badhelo", "email-update");
 templates2events("/var/service/qpsmtpd/config/whitelisthelo", "email-update");
 templates2events("/var/service/qpsmtpd/config/whitelisthosts", "email-update");
 templates2events("/var/service/qpsmtpd/config/whitelistsenders", "email-update");
 
+
+my $wbl = "wbl-update";
+templates2events("/var/qmail/control/badmailfrom", "$wbl");
+templates2events("/var/service/qpsmtpd/config/badmailfrom", "$wbl");
+templates2events("/var/service/qpsmtpd/config/badhelo", "$wbl");
+templates2events("/var/service/qpsmtpd/config/dnsbl_zones", "$wbl");
+templates2events("/var/service/qpsmtpd/config/rhsbl_zones ", "$wbl");
+templates2events("/var/service/qpsmtpd/config/whitelisthelo", "$wbl");
+templates2events("/var/service/qpsmtpd/config/whitelisthosts", "$wbl");
+templates2events("/var/service/qpsmtpd/config/whitelistsenders", "$wbl");
+templates2events("/etc/mail/spamassassin/local.cf", "$wbl");
+safe_symlink("restart", "root/etc/e-smith/events/$wbl/services2adjust/spamassassin");
+safe_symlink("../../plugins/11whitelist",
+             "root/etc/e-smith/templates/var/service/qpsmtpd/config/peers/0/11whitelist");
+
 # own event
 my $wbl = "smeserver-wbl-update";
 templates2events("/var/qmail/control/badmailfrom", "$wbl");
diff -Nur --no-dereference smeserver-wbl-0.5.0.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/wbl.pm smeserver-wbl-0.5.0/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/wbl.pm
--- smeserver-wbl-0.5.0.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/wbl.pm	2022-04-17 15:25:33.784000000 -0400
+++ smeserver-wbl-0.5.0/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/wbl.pm	2022-04-17 15:28:04.611000000 -0400
@@ -228,7 +228,7 @@
     }
 
     ##Update email settings
-    unless ( system ("/sbin/e-smith/signal-event", "smeserver-wbl-update") == 0 ){
+    unless ( system ("/sbin/e-smith/signal-event", "wbl-update") == 0 ){
         $fm->error('ERROR_UPDATING');
         return undef;
     }
@@ -321,7 +321,7 @@
     }
 
     ##Update email settings
-    unless ( system ("/sbin/e-smith/signal-event", "smeserver-wbl-update") == 0 ){
+    unless ( system ("/sbin/e-smith/signal-event", "wbl-update") == 0 ){
         $fm->error('ERROR_UPDATING');
         return undef;
     }
@@ -334,7 +334,7 @@
     my $fm = shift;
     my $q = $fm->{'cgi'};
 
-    unless ( system ("/sbin/e-smith/signal-event", "smeserver-wbl-update") == 0 )
+    unless ( system ("/sbin/e-smith/signal-event", "wbl-update") == 0 )
     {
         $fm->error('ERROR_UPDATING');
         return undef;
@@ -394,7 +394,7 @@
 
     ##Update email settings
 
-    unless ( system ("/sbin/e-smith/signal-event", "smeserver-wbl-update") == 0 ){
+    unless ( system ("/sbin/e-smith/signal-event", "wbl-update") == 0 ){
         $fm->error('ERROR_UPDATING');
         return undef;
     }
diff -Nur --no-dereference smeserver-wbl-0.5.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Wbl.pm smeserver-wbl-0.5.0/root/usr/share/smanager/lib/SrvMngr/Controller/Wbl.pm
--- smeserver-wbl-0.5.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Wbl.pm	2020-06-06 13:25:03.000000000 -0400
+++ smeserver-wbl-0.5.0/root/usr/share/smanager/lib/SrvMngr/Controller/Wbl.pm	2022-04-17 15:28:28.183000000 -0400
@@ -369,7 +369,7 @@
     $db->set_prop('qpsmtpd', 'RBLList', "$rbllistdb");
 
     #Update email settings
-    unless ( system ("/sbin/e-smith/signal-event", "smeserver-wbl-update") == 0 ){
+    unless ( system ("/sbin/e-smith/signal-event", "wbl-update") == 0 ){
         return 'RBL : ' . $c->l('wbl_ERROR_UPDATING');
     }
 
@@ -441,7 +441,7 @@
     }
 
     #Update email settings
-    unless ( system ("/sbin/e-smith/signal-event", "smeserver-wbl-update") == 0 ) {
+    unless ( system ("/sbin/e-smith/signal-event", "wbl-update") == 0 ) {
         return 'BLACK: '. $c->l('wbl_ERROR_UPDATING');
     }
 
@@ -541,7 +541,7 @@
     }
 
     #Update email settings
-    unless ( system ("/sbin/e-smith/signal-event", "smeserver-wbl-update") == 0 ) {
+    unless ( system ("/sbin/e-smith/signal-event", "wbl-update") == 0 ) {
         return 'WHITE: '. $c->l('wbl_ERROR_UPDATING');
     }