integrate new medias and remove unused
integrate safe template