fix pkgs
add generic rules