Move shorewall keywords to basic-programs