Mercurial > repos > devteam > emboss_5

changeset 11:0e2484b6829b draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
planemo upload for repository https://github.com/galaxyproject/tools-iuc/tree/master/tools/emboss_5 commit b583bbeb8fc90cd4b1e987a56982e7cf4aed1a68
author iuc
date Mon, 30 Jan 2017 13:27:40 -0500
parents 9b98d3d903c6
children ace31bbde4c0
files emboss_antigenic.xml emboss_backtranseq.xml emboss_banana.pl emboss_banana.xml emboss_biosed.xml emboss_btwisted.xml emboss_cai.xml emboss_cai_custom.xml emboss_chaos.xml emboss_charge.xml emboss_checktrans.xml emboss_chips.xml emboss_cirdna.xml emboss_codcmp.xml emboss_coderet.xml emboss_compseq.xml emboss_cpgplot.xml emboss_cpgreport.xml emboss_cusp.xml emboss_cutseq.xml emboss_dan.xml emboss_degapseq.xml emboss_descseq.xml emboss_diffseq.xml emboss_digest.xml emboss_dotmatcher.xml emboss_dotpath.xml emboss_dottup.xml emboss_dreg.xml emboss_einverted.xml emboss_epestfind.xml emboss_equicktandem.xml emboss_est2genome.xml emboss_etandem.xml emboss_extractfeat.xml emboss_extractseq.xml emboss_format_corrector.py emboss_freak.xml emboss_fuzznuc.xml emboss_fuzzpro.xml emboss_fuzztran.xml emboss_garnier.xml emboss_geecee.xml emboss_getorf.xml emboss_helixturnhelix.xml emboss_hmoment.xml emboss_iep.xml emboss_infoseq.xml emboss_isochore.xml emboss_lindna.xml emboss_marscan.xml emboss_maskfeat.xml emboss_maskseq.xml emboss_matcher.xml emboss_megamerger.xml emboss_merger.xml emboss_msbar.xml emboss_needle.xml emboss_newcpgreport.xml emboss_newcpgseek.xml emboss_newseq.xml emboss_noreturn.xml emboss_notseq.xml emboss_nthseq.xml emboss_octanol.xml emboss_oddcomp.xml emboss_palindrome.xml emboss_pasteseq.xml emboss_patmatdb.xml emboss_pepcoil.xml emboss_pepinfo.xml emboss_pepnet.xml emboss_pepstats.xml emboss_pepwheel.xml emboss_pepwindow.xml emboss_pepwindowall.xml emboss_plotcon.xml emboss_plotorf.xml emboss_polydot.xml emboss_preg.xml emboss_prettyplot.xml emboss_prettyseq.xml emboss_primersearch.xml emboss_revseq.xml emboss_seqmatchall.xml emboss_seqret.xml emboss_showfeat.xml emboss_shuffleseq.xml emboss_sigcleave.xml emboss_sirna.xml emboss_sixpack.xml emboss_skipseq.xml emboss_splitter.xml emboss_supermatcher.xml emboss_syco.xml emboss_tcode.xml emboss_textsearch.xml emboss_tmap.xml emboss_tranalign.xml emboss_transeq.xml emboss_trimest.xml emboss_trimseq.xml emboss_twofeat.xml emboss_union.xml emboss_vectorstrip.xml emboss_water.xml emboss_wobble.xml emboss_wordcount.xml emboss_wordmatch.xml macros.xml
diffstat 110 files changed, 5206 insertions(+), 6591 deletions(-) [+]
line wrap: on
line diff
--- a/emboss_antigenic.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_antigenic.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,36 +1,35 @@
-<tool id="EMBOSS: antigenic1" name="antigenic" version="5.0.0">
-  <description>Predicts potentially antigenic regions of a protein sequence, using the method of Kolaskar and Tongaonkar.</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>antigenic -sequence $input1 -outfile $out_file1 -minlen $minlen -rformat2 $out_format1 -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>On query</label>
-    </param>
-    <param name="minlen" type="text" value="6">
-      <label>Minimum Length of region</label>
-    </param>
-    <param name="out_format1" type="select">
-      <label>Output format</label>
-      <option value="gff">GFF</option>
-      <option value="pir">PIR</option>
-      <option value="swiss">SwissProt</option>
-      <option value="dbmotif">DbMotif</option>
-      <option value="diffseq">diffseq</option>
-      <option value="excel">Excel (TAB Delimited)</option>
-      <option value="feattable">FeatTable</option>
-      <option value="motif">Motif</option>
-      <option value="nametable">NameTable</option>
-      <option value="regions">Regions</option>
-      <option value="seqtable">SeqTable</option>
-      <option value="simple">SRS simple</option>
-      <option value="srs">SRS</option>
-      <option value="table">Table</option>
+<tool id="EMBOSS: antigenic1" name="antigenic" version="5.0.0.1">
+  <description>Predicts potentially antigenic regions of a protein sequence, using the method of Kolaskar and Tongaonkar.</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>antigenic -sequence '$input1' -outfile '$out_file1' -minlen $minlen -rformat2 $out_format1 -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="On query" />
+    <param name="minlen" type="integer" value="6" label="Minimum length of region" />
+    <param name="out_format1" type="select" label="Output format">
+      <option value="gff">GFF</option>
+      <option value="pir">PIR</option>
+      <option value="swiss">SwissProt</option>
+      <option value="dbmotif">DbMotif</option>
+      <option value="diffseq">diffseq</option>
+      <option value="excel">Excel (TAB Delimited)</option>
+      <option value="feattable">FeatTable</option>
+      <option value="motif">Motif</option>
+      <option value="nametable">NameTable</option>
+      <option value="regions">Regions</option>
+      <option value="seqtable">SeqTable</option>
+      <option value="simple">SRS simple</option>
+      <option value="srs">SRS</option>
+      <option value="table">Table</option>
       <option value="tagseq">Tagseq</option>
-      <option value="antigenic">Antigenic Output File</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="antigenic" name="out_file1" />
+      <option value="antigenic">Antigenic Output File</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="antigenic" />
   </outputs>
   <tests>
     <test>
@@ -39,20 +38,11 @@
       <param name="out_format1" value="excel"/>
       <output name="out_file1" file="emboss_antigenic_out.tabular"/>
     </test>
-  </tests>
-  <code file="emboss_format_corrector.py" />
+  </tests>
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/antigenic.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
-    
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/antigenic.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_backtranseq.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_backtranseq.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,200 +1,200 @@
-<tool id="EMBOSS: backtranseq2" name="backtranseq" version="5.0.0">
-  <description>Back translate a protein sequence</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>backtranseq -sequence $input1 -outfile $out_file1 -cfile $cfile -osformat2 $out_format1 -auto</command>
-  <inputs>
-    <param format="fasta" name="input1" type="data">
-      <label>On query</label>
-    </param>
-    <param name="cfile" type="select">
-      <label>Codon Usage File</label>
-      <option value="Ehum.cut">Ehum.cut</option>
-      <option value="Eacc.cut">Eacc.cut</option>
-      <option value="Eadenovirus5.cut">Eadenovirus5.cut</option>
-      <option value="Eadenovirus7.cut">Eadenovirus7.cut</option>
-      <option value="Eaidlav.cut">Eaidlav.cut</option>
-      <option value="Eanasp.cut">Eanasp.cut</option>
-      <option value="Eani.cut">Eani.cut</option>
-      <option value="Eani_h.cut">Eani_h.cut</option>
-      <option value="Eanidmit.cut">Eanidmit.cut</option>
-      <option value="Easn.cut">Easn.cut</option>
-      <option value="Eath.cut">Eath.cut</option>
-      <option value="Eatu.cut">Eatu.cut</option>
-      <option value="Eavi.cut">Eavi.cut</option>
-      <option value="Ebja.cut">Ebja.cut</option>
-      <option value="Ebly.cut">Ebly.cut</option>
-      <option value="Ebme.cut">Ebme.cut</option>
-      <option value="Ebmo.cut">Ebmo.cut</option>
-      <option value="Ebna.cut">Ebna.cut</option>
-      <option value="Ebov.cut">Ebov.cut</option>
-      <option value="Ebovsp.cut">Ebovsp.cut</option>
-      <option value="Ebst.cut">Ebst.cut</option>
-      <option value="Ebsu.cut">Ebsu.cut</option>
-      <option value="Ebsu_h.cut">Ebsu_h.cut</option>
-      <option value="Ecac.cut">Ecac.cut</option>
-      <option value="Ecal.cut">Ecal.cut</option>
-      <option value="Eccr.cut">Eccr.cut</option>
-      <option value="Ecel.cut">Ecel.cut</option>
-      <option value="Echi.cut">Echi.cut</option>
-      <option value="Echicken.cut">Echicken.cut</option>
-      <option value="Echisp.cut">Echisp.cut</option>
-      <option value="Echk.cut">Echk.cut</option>
-      <option value="Echmp.cut">Echmp.cut</option>
-      <option value="Echnt.cut">Echnt.cut</option>
-      <option value="Echos.cut">Echos.cut</option>
-      <option value="Echzm.cut">Echzm.cut</option>
-      <option value="Echzmrubp.cut">Echzmrubp.cut</option>
-      <option value="Ecpx.cut">Ecpx.cut</option>
-      <option value="Ecre.cut">Ecre.cut</option>
-      <option value="Ecrisp.cut">Ecrisp.cut</option>
-      <option value="Ectr.cut">Ectr.cut</option>
-      <option value="Edayhoff.cut">Edayhoff.cut</option>
-      <option value="Eddi.cut">Eddi.cut</option>
-      <option value="Eddi_h.cut">Eddi_h.cut</option>
-      <option value="Edog.cut">Edog.cut</option>
-      <option value="Edro.cut">Edro.cut</option>
-      <option value="Edro_h.cut">Edro_h.cut</option>
-      <option value="Edrosophila.cut">Edrosophila.cut</option>
-      <option value="Eeca.cut">Eeca.cut</option>
-      <option value="Eeco.cut">Eeco.cut</option>
-      <option value="Eeco_h.cut">Eeco_h.cut</option>
-      <option value="Eecoli.cut">Eecoli.cut</option>
-      <option value="Ef1.cut">Ef1.cut</option>
-      <option value="Efish.cut">Efish.cut</option>
-      <option value="Efmdvpolyp.cut">Efmdvpolyp.cut</option>
-      <option value="Eham.cut">Eham.cut</option>
-      <option value="Ehha.cut">Ehha.cut</option>
-      <option value="Ehin.cut">Ehin.cut</option>
-      <option value="Ehma.cut">Ehma.cut</option>
-      <option value="Ehuman.cut">Ehuman.cut</option>
-      <option value="Ekla.cut">Ekla.cut</option>
-      <option value="Ekpn.cut">Ekpn.cut</option>
-      <option value="Ella.cut">Ella.cut</option>
-      <option value="Emac.cut">Emac.cut</option>
-      <option value="Emaize.cut">Emaize.cut</option>
-      <option value="Emam_h.cut">Emam_h.cut</option>
-      <option value="Emixlg.cut">Emixlg.cut</option>
-      <option value="Emouse.cut">Emouse.cut</option>
-      <option value="Emsa.cut">Emsa.cut</option>
-      <option value="Emse.cut">Emse.cut</option>
-      <option value="Emta.cut">Emta.cut</option>
-      <option value="Emtu.cut">Emtu.cut</option>
-      <option value="Emus.cut">Emus.cut</option>
-      <option value="Emussp.cut">Emussp.cut</option>
-      <option value="Emva.cut">Emva.cut</option>
-      <option value="Emze.cut">Emze.cut</option>
-      <option value="Emzecp.cut">Emzecp.cut</option>
-      <option value="Encr.cut">Encr.cut</option>
-      <option value="Eneu.cut">Eneu.cut</option>
-      <option value="Engo.cut">Engo.cut</option>
-      <option value="Eoncsp.cut">Eoncsp.cut</option>
-      <option value="Epae.cut">Epae.cut</option>
-      <option value="Epea.cut">Epea.cut</option>
-      <option value="Epet.cut">Epet.cut</option>
-      <option value="Epfa.cut">Epfa.cut</option>
-      <option value="Ephix174.cut">Ephix174.cut</option>
-      <option value="Ephv.cut">Ephv.cut</option>
-      <option value="Ephy.cut">Ephy.cut</option>
-      <option value="Epig.cut">Epig.cut</option>
-      <option value="Epolyomaa2.cut">Epolyomaa2.cut</option>
-      <option value="Epombe.cut">Epombe.cut</option>
-      <option value="Epombecai.cut">Epombecai.cut</option>
-      <option value="Epot.cut">Epot.cut</option>
-      <option value="Eppu.cut">Eppu.cut</option>
-      <option value="Epse.cut">Epse.cut</option>
-      <option value="Epsy.cut">Epsy.cut</option>
-      <option value="Epvu.cut">Epvu.cut</option>
-      <option value="Erab.cut">Erab.cut</option>
-      <option value="Erabbit.cut">Erabbit.cut</option>
-      <option value="Erabsp.cut">Erabsp.cut</option>
-      <option value="Erat.cut">Erat.cut</option>
-      <option value="Eratsp.cut">Eratsp.cut</option>
-      <option value="Erca.cut">Erca.cut</option>
-      <option value="Erhm.cut">Erhm.cut</option>
-      <option value="Eric.cut">Eric.cut</option>
-      <option value="Erle.cut">Erle.cut</option>
-      <option value="Erme.cut">Erme.cut</option>
-      <option value="Ersp.cut">Ersp.cut</option>
-      <option value="Esalsp.cut">Esalsp.cut</option>
-      <option value="Esau.cut">Esau.cut</option>
-      <option value="Esco.cut">Esco.cut</option>
-      <option value="Esgi.cut">Esgi.cut</option>
-      <option value="Eshp.cut">Eshp.cut</option>
-      <option value="Eshpsp.cut">Eshpsp.cut</option>
-      <option value="Esli.cut">Esli.cut</option>
-      <option value="Eslm.cut">Eslm.cut</option>
-      <option value="Esma.cut">Esma.cut</option>
-      <option value="Esmi.cut">Esmi.cut</option>
-      <option value="Esmu.cut">Esmu.cut</option>
-      <option value="Esoy.cut">Esoy.cut</option>
-      <option value="Espi.cut">Espi.cut</option>
-      <option value="Espn.cut">Espn.cut</option>
-      <option value="Espo.cut">Espo.cut</option>
-      <option value="Espo_h.cut">Espo_h.cut</option>
-      <option value="Espu.cut">Espu.cut</option>
-      <option value="Esta.cut">Esta.cut</option>
-      <option value="Esty.cut">Esty.cut</option>
-      <option value="Esus.cut">Esus.cut</option>
-      <option value="Esv40.cut">Esv40.cut</option>
-      <option value="Esyhsp.cut">Esyhsp.cut</option>
-      <option value="Esynsp.cut">Esynsp.cut</option>
-      <option value="Etbr.cut">Etbr.cut</option>
-      <option value="Etcr.cut">Etcr.cut</option>
-      <option value="Eter.cut">Eter.cut</option>
-      <option value="Etetsp.cut">Etetsp.cut</option>
-      <option value="Etob.cut">Etob.cut</option>
-      <option value="Etobcp.cut">Etobcp.cut</option>
-      <option value="Etom.cut">Etom.cut</option>
-      <option value="Etrb.cut">Etrb.cut</option>
-      <option value="Evco.cut">Evco.cut</option>
-      <option value="Ewht.cut">Ewht.cut</option>
-      <option value="Exel.cut">Exel.cut</option>
-      <option value="Exenopus.cut">Exenopus.cut</option>
-      <option value="Eyeast.cut">Eyeast.cut</option>
-      <option value="Eyeastcai.cut">Eyeastcai.cut</option>
-      <option value="Eyen.cut">Eyen.cut</option>
-      <option value="Eysc.cut">Eysc.cut</option>
-      <option value="Eysc_h.cut">Eysc_h.cut</option>
-      <option value="Eyscmt.cut">Eyscmt.cut</option>
-      <option value="Eysp.cut">Eysp.cut</option>
-      <option value="Ezebrafish.cut">Ezebrafish.cut</option>
-      <option value="Ezma.cut">Ezma.cut</option>
-    </param>
-    <param name="out_format1" type="select">
-      <label>Output Sequence File Format</label>
-      <option value="fasta">FASTA (m)</option>
-      <option value="acedb">ACeDB (m)</option>
-      <option value="asn1">ASN.1 (m)</option>
-      <option value="clustal">Clustal (m)</option>
-      <option value="codata">CODATA (m)</option>
-      <option value="embl">EMBL (m)</option>
-      <option value="fitch">Fitch (m)</option>
-      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
-      <option value="genbank">GENBANK (m)</option>
-      <option value="gff">GFF (m)</option>
-      <option value="hennig86">Hennig86 (m)</option>
-      <option value="ig">Intelligenetics (m)</option>
-      <option value="jackknifer">Jackknifer (m)</option>
-      <option value="jackknifernon">Jackknifernon (m)</option>
-      <option value="mega">Mega (m)</option>
-      <option value="meganon">Meganon (m)</option>
-      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
-      <option value="pir">NBRF (PIR) (m)</option>
-      <option value="ncbi">NCBI style FASTA (m)</option>
-      <option value="nexus">Nexus/PAUP (m)</option>
-      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
-      <option value="phylip">PHYLIP interleaved (m)</option>
-      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
-      <option value="selex">SELEX (m)</option>
-      <option value="staden">Staden (s)</option>
-      <option value="strider">DNA strider (m)</option>
-      <option value="swiss">SwisProt entry (m)</option>
-      <option value="text">Plain sequence (s)</option>
-      <option value="treecon">Treecon (m)</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="txt" name="out_file1" />
+<tool id="EMBOSS: backtranseq2" name="backtranseq" version="5.0.0">
+  <description>Back translate a protein sequence</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>backtranseq -sequence '$input1' -outfile '$out_file1' -cfile $cfile -osformat2 $out_format1 -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="fasta" label="On query" />
+    <param name="cfile" type="select" label="Codon usage file">
+      <option value="Ehum.cut">Ehum.cut</option>
+      <option value="Eacc.cut">Eacc.cut</option>
+      <option value="Eadenovirus5.cut">Eadenovirus5.cut</option>
+      <option value="Eadenovirus7.cut">Eadenovirus7.cut</option>
+      <option value="Eaidlav.cut">Eaidlav.cut</option>
+      <option value="Eanasp.cut">Eanasp.cut</option>
+      <option value="Eani.cut">Eani.cut</option>
+      <option value="Eani_h.cut">Eani_h.cut</option>
+      <option value="Eanidmit.cut">Eanidmit.cut</option>
+      <option value="Easn.cut">Easn.cut</option>
+      <option value="Eath.cut">Eath.cut</option>
+      <option value="Eatu.cut">Eatu.cut</option>
+      <option value="Eavi.cut">Eavi.cut</option>
+      <option value="Ebja.cut">Ebja.cut</option>
+      <option value="Ebly.cut">Ebly.cut</option>
+      <option value="Ebme.cut">Ebme.cut</option>
+      <option value="Ebmo.cut">Ebmo.cut</option>
+      <option value="Ebna.cut">Ebna.cut</option>
+      <option value="Ebov.cut">Ebov.cut</option>
+      <option value="Ebovsp.cut">Ebovsp.cut</option>
+      <option value="Ebst.cut">Ebst.cut</option>
+      <option value="Ebsu.cut">Ebsu.cut</option>
+      <option value="Ebsu_h.cut">Ebsu_h.cut</option>
+      <option value="Ecac.cut">Ecac.cut</option>
+      <option value="Ecal.cut">Ecal.cut</option>
+      <option value="Eccr.cut">Eccr.cut</option>
+      <option value="Ecel.cut">Ecel.cut</option>
+      <option value="Echi.cut">Echi.cut</option>
+      <option value="Echicken.cut">Echicken.cut</option>
+      <option value="Echisp.cut">Echisp.cut</option>
+      <option value="Echk.cut">Echk.cut</option>
+      <option value="Echmp.cut">Echmp.cut</option>
+      <option value="Echnt.cut">Echnt.cut</option>
+      <option value="Echos.cut">Echos.cut</option>
+      <option value="Echzm.cut">Echzm.cut</option>
+      <option value="Echzmrubp.cut">Echzmrubp.cut</option>
+      <option value="Ecpx.cut">Ecpx.cut</option>
+      <option value="Ecre.cut">Ecre.cut</option>
+      <option value="Ecrisp.cut">Ecrisp.cut</option>
+      <option value="Ectr.cut">Ectr.cut</option>
+      <option value="Edayhoff.cut">Edayhoff.cut</option>
+      <option value="Eddi.cut">Eddi.cut</option>
+      <option value="Eddi_h.cut">Eddi_h.cut</option>
+      <option value="Edog.cut">Edog.cut</option>
+      <option value="Edro.cut">Edro.cut</option>
+      <option value="Edro_h.cut">Edro_h.cut</option>
+      <option value="Edrosophila.cut">Edrosophila.cut</option>
+      <option value="Eeca.cut">Eeca.cut</option>
+      <option value="Eeco.cut">Eeco.cut</option>
+      <option value="Eeco_h.cut">Eeco_h.cut</option>
+      <option value="Eecoli.cut">Eecoli.cut</option>
+      <option value="Ef1.cut">Ef1.cut</option>
+      <option value="Efish.cut">Efish.cut</option>
+      <option value="Efmdvpolyp.cut">Efmdvpolyp.cut</option>
+      <option value="Eham.cut">Eham.cut</option>
+      <option value="Ehha.cut">Ehha.cut</option>
+      <option value="Ehin.cut">Ehin.cut</option>
+      <option value="Ehma.cut">Ehma.cut</option>
+      <option value="Ehuman.cut">Ehuman.cut</option>
+      <option value="Ekla.cut">Ekla.cut</option>
+      <option value="Ekpn.cut">Ekpn.cut</option>
+      <option value="Ella.cut">Ella.cut</option>
+      <option value="Emac.cut">Emac.cut</option>
+      <option value="Emaize.cut">Emaize.cut</option>
+      <option value="Emam_h.cut">Emam_h.cut</option>
+      <option value="Emixlg.cut">Emixlg.cut</option>
+      <option value="Emouse.cut">Emouse.cut</option>
+      <option value="Emsa.cut">Emsa.cut</option>
+      <option value="Emse.cut">Emse.cut</option>
+      <option value="Emta.cut">Emta.cut</option>
+      <option value="Emtu.cut">Emtu.cut</option>
+      <option value="Emus.cut">Emus.cut</option>
+      <option value="Emussp.cut">Emussp.cut</option>
+      <option value="Emva.cut">Emva.cut</option>
+      <option value="Emze.cut">Emze.cut</option>
+      <option value="Emzecp.cut">Emzecp.cut</option>
+      <option value="Encr.cut">Encr.cut</option>
+      <option value="Eneu.cut">Eneu.cut</option>
+      <option value="Engo.cut">Engo.cut</option>
+      <option value="Eoncsp.cut">Eoncsp.cut</option>
+      <option value="Epae.cut">Epae.cut</option>
+      <option value="Epea.cut">Epea.cut</option>
+      <option value="Epet.cut">Epet.cut</option>
+      <option value="Epfa.cut">Epfa.cut</option>
+      <option value="Ephix174.cut">Ephix174.cut</option>
+      <option value="Ephv.cut">Ephv.cut</option>
+      <option value="Ephy.cut">Ephy.cut</option>
+      <option value="Epig.cut">Epig.cut</option>
+      <option value="Epolyomaa2.cut">Epolyomaa2.cut</option>
+      <option value="Epombe.cut">Epombe.cut</option>
+      <option value="Epombecai.cut">Epombecai.cut</option>
+      <option value="Epot.cut">Epot.cut</option>
+      <option value="Eppu.cut">Eppu.cut</option>
+      <option value="Epse.cut">Epse.cut</option>
+      <option value="Epsy.cut">Epsy.cut</option>
+      <option value="Epvu.cut">Epvu.cut</option>
+      <option value="Erab.cut">Erab.cut</option>
+      <option value="Erabbit.cut">Erabbit.cut</option>
+      <option value="Erabsp.cut">Erabsp.cut</option>
+      <option value="Erat.cut">Erat.cut</option>
+      <option value="Eratsp.cut">Eratsp.cut</option>
+      <option value="Erca.cut">Erca.cut</option>
+      <option value="Erhm.cut">Erhm.cut</option>
+      <option value="Eric.cut">Eric.cut</option>
+      <option value="Erle.cut">Erle.cut</option>
+      <option value="Erme.cut">Erme.cut</option>
+      <option value="Ersp.cut">Ersp.cut</option>
+      <option value="Esalsp.cut">Esalsp.cut</option>
+      <option value="Esau.cut">Esau.cut</option>
+      <option value="Esco.cut">Esco.cut</option>
+      <option value="Esgi.cut">Esgi.cut</option>
+      <option value="Eshp.cut">Eshp.cut</option>
+      <option value="Eshpsp.cut">Eshpsp.cut</option>
+      <option value="Esli.cut">Esli.cut</option>
+      <option value="Eslm.cut">Eslm.cut</option>
+      <option value="Esma.cut">Esma.cut</option>
+      <option value="Esmi.cut">Esmi.cut</option>
+      <option value="Esmu.cut">Esmu.cut</option>
+      <option value="Esoy.cut">Esoy.cut</option>
+      <option value="Espi.cut">Espi.cut</option>
+      <option value="Espn.cut">Espn.cut</option>
+      <option value="Espo.cut">Espo.cut</option>
+      <option value="Espo_h.cut">Espo_h.cut</option>
+      <option value="Espu.cut">Espu.cut</option>
+      <option value="Esta.cut">Esta.cut</option>
+      <option value="Esty.cut">Esty.cut</option>
+      <option value="Esus.cut">Esus.cut</option>
+      <option value="Esv40.cut">Esv40.cut</option>
+      <option value="Esyhsp.cut">Esyhsp.cut</option>
+      <option value="Esynsp.cut">Esynsp.cut</option>
+      <option value="Etbr.cut">Etbr.cut</option>
+      <option value="Etcr.cut">Etcr.cut</option>
+      <option value="Eter.cut">Eter.cut</option>
+      <option value="Etetsp.cut">Etetsp.cut</option>
+      <option value="Etob.cut">Etob.cut</option>
+      <option value="Etobcp.cut">Etobcp.cut</option>
+      <option value="Etom.cut">Etom.cut</option>
+      <option value="Etrb.cut">Etrb.cut</option>
+      <option value="Evco.cut">Evco.cut</option>
+      <option value="Ewht.cut">Ewht.cut</option>
+      <option value="Exel.cut">Exel.cut</option>
+      <option value="Exenopus.cut">Exenopus.cut</option>
+      <option value="Eyeast.cut">Eyeast.cut</option>
+      <option value="Eyeastcai.cut">Eyeastcai.cut</option>
+      <option value="Eyen.cut">Eyen.cut</option>
+      <option value="Eysc.cut">Eysc.cut</option>
+      <option value="Eysc_h.cut">Eysc_h.cut</option>
+      <option value="Eyscmt.cut">Eyscmt.cut</option>
+      <option value="Eysp.cut">Eysp.cut</option>
+      <option value="Ezebrafish.cut">Ezebrafish.cut</option>
+      <option value="Ezma.cut">Ezma.cut</option>
+    </param>
+    <param name="out_format1" type="select" label="Output sequence file format">
+      <option value="fasta">FASTA (m)</option>
+      <option value="acedb">ACeDB (m)</option>
+      <option value="asn1">ASN.1 (m)</option>
+      <option value="clustal">Clustal (m)</option>
+      <option value="codata">CODATA (m)</option>
+      <option value="embl">EMBL (m)</option>
+      <option value="fitch">Fitch (m)</option>
+      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
+      <option value="genbank">GENBANK (m)</option>
+      <option value="gff">GFF (m)</option>
+      <option value="hennig86">Hennig86 (m)</option>
+      <option value="ig">Intelligenetics (m)</option>
+      <option value="jackknifer">Jackknifer (m)</option>
+      <option value="jackknifernon">Jackknifernon (m)</option>
+      <option value="mega">Mega (m)</option>
+      <option value="meganon">Meganon (m)</option>
+      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
+      <option value="pir">NBRF (PIR) (m)</option>
+      <option value="ncbi">NCBI style FASTA (m)</option>
+      <option value="nexus">Nexus/PAUP (m)</option>
+      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
+      <option value="phylip">PHYLIP interleaved (m)</option>
+      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
+      <option value="selex">SELEX (m)</option>
+      <option value="staden">Staden (s)</option>
+      <option value="strider">DNA strider (m)</option>
+      <option value="swiss">SwisProt entry (m)</option>
+      <option value="text">Plain sequence (s)</option>
+      <option value="treecon">Treecon (m)</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="txt" />
   </outputs>
   <tests>
     <test>
@@ -203,26 +203,17 @@
       <param name="out_format1" value="fasta"/>
       <output name="out_file1" file="emboss_backtranseq_out.fasta"/>
     </test>
-  </tests>
-  <code file="emboss_format_corrector.py" />
+  </tests>
   <help>
+.. class:: warningmark
 
-.. class:: warningmark 
+The input dataset needs to be sequences.
 
-The input dataset needs to be sequences. 
-
------ 
+-----
 
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/backtranseq.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/backtranseq.html
   </help>
+  <expand macro="citations" />
 </tool>
--- a/emboss_banana.pl	Fri Aug 12 19:17:10 2016 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-#! /usr/bin/perl -w
-use strict;
-
-my $cmd_string = join (" ",@ARGV);
-#my $cmd_string = "/home/djb396/temp/emboss/bin/banana -sequence /home/djb396/universe-prototype/test.fasta -outfile result.txt -graph png -goutfile results -auto";
-my $results = `$cmd_string`;
-my @files = split("\n",$results);
-foreach my $thisLine (@files)
-{
-	if ($thisLine =~ /Created /i)
-	{
-		$thisLine =~ /[\w|\.]+$/;
-		$thisLine =$&;
-		print "outfile: $thisLine\n";
-	}
-}
--- a/emboss_banana.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_banana.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,32 +1,26 @@
-<tool id="EMBOSS: banana3" name="banana" version="5.0.0">
-  <description>Bending and curvature plot in B-DNA</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>banana -sequence $input1 -outfile $out_file1 -graph none -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>On query</label>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="txt" name="out_file1" />
+<tool id="EMBOSS: banana3" name="banana" version="5.0.0">
+  <description>Bending and curvature plot in B-DNA</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <command>banana -sequence '$input1' -outfile '$out_file1' -graph none -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="On query" />
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="txt" />
   </outputs>
   <tests>
     <test>
       <param name="input1" value="2.fasta"/>
       <output name="out_file1" file="emboss_banana_out.txt"/>
     </test>
-  </tests>
+  </tests>
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/banana.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/banana.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_biosed.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_biosed.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,52 +1,49 @@
-<tool id="EMBOSS: biosed4" name="biosed" version="5.0.0">
-  <description>Replace or delete sequence sections</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>biosed -sequence $input1 -outseq $out_file1 -target "$target" -replace "$replace" -osformat2 "$out_format1" -auto</command>
-  <inputs>
-    <param format="fasta" name="input1" type="data">
-      <label>On query</label>
-    </param>
-    <param name="target" type="text" value="atg">
-      <label>Replace all</label>
-    </param>
-    <param name="replace" type="text" value="atg">
-      <label>with</label>
-    </param>
-    <param name="out_format1" type="select">
-      <label>Output Sequence File Format</label>
-      <option value="fasta">FASTA (m)</option>
-      <option value="acedb">ACeDB (m)</option>
-      <option value="asn1">ASN.1 (m)</option>
-      <option value="clustal">Clustal (m)</option>
-      <option value="codata">CODATA (m)</option>
-      <option value="embl">EMBL (m)</option>
-      <option value="fitch">Fitch (m)</option>
-      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
-      <option value="genbank">GENBANK (m)</option>
-      <option value="gff">GFF (m)</option>
-      <option value="hennig86">Hennig86 (m)</option>
-      <option value="ig">Intelligenetics (m)</option>
-      <option value="jackknifer">Jackknifer (m)</option>
-      <option value="jackknifernon">Jackknifernon (m)</option>
-      <option value="mega">Mega (m)</option>
-      <option value="meganon">Meganon (m)</option>
-      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
-      <option value="pir">NBRF (PIR) (m)</option>
-      <option value="ncbi">NCBI style FASTA (m)</option>
-      <option value="nexus">Nexus/PAUP (m)</option>
-      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
-      <option value="phylip">PHYLIP interleaved (m)</option>
-      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
-      <option value="selex">SELEX (m)</option>
-      <option value="staden">Staden (s)</option>
-      <option value="strider">DNA strider (m)</option>
-      <option value="swiss">SwisProt entry (m)</option>
-      <option value="text">Plain sequence (s)</option>
-      <option value="treecon">Treecon (m)</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="txt" name="out_file1" />
+<tool id="EMBOSS: biosed4" name="biosed" version="5.0.0">
+  <description>Replace or delete sequence sections</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>biosed -sequence '$input1' -outseq '$out_file1' -target '$target' -replace '$replace' -osformat2 $out_format1 -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="fasta" label="On query" />
+    <param name="target" type="text" value="atg" label="Replace all" />
+    <param name="replace" type="text" value="atg" label="with" />
+    <param name="out_format1" type="select" label="Output sequence file format">
+      <option value="fasta">FASTA (m)</option>
+      <option value="acedb">ACeDB (m)</option>
+      <option value="asn1">ASN.1 (m)</option>
+      <option value="clustal">Clustal (m)</option>
+      <option value="codata">CODATA (m)</option>
+      <option value="embl">EMBL (m)</option>
+      <option value="fitch">Fitch (m)</option>
+      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
+      <option value="genbank">GENBANK (m)</option>
+      <option value="gff">GFF (m)</option>
+      <option value="hennig86">Hennig86 (m)</option>
+      <option value="ig">Intelligenetics (m)</option>
+      <option value="jackknifer">Jackknifer (m)</option>
+      <option value="jackknifernon">Jackknifernon (m)</option>
+      <option value="mega">Mega (m)</option>
+      <option value="meganon">Meganon (m)</option>
+      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
+      <option value="pir">NBRF (PIR) (m)</option>
+      <option value="ncbi">NCBI style FASTA (m)</option>
+      <option value="nexus">Nexus/PAUP (m)</option>
+      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
+      <option value="phylip">PHYLIP interleaved (m)</option>
+      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
+      <option value="selex">SELEX (m)</option>
+      <option value="staden">Staden (s)</option>
+      <option value="strider">DNA strider (m)</option>
+      <option value="swiss">SwisProt entry (m)</option>
+      <option value="text">Plain sequence (s)</option>
+      <option value="treecon">Treecon (m)</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="txt" />
   </outputs>
   <tests>
     <test>
@@ -56,10 +53,8 @@
       <param name="out_format1" value="fasta"/>
       <output name="out_file1" file="emboss_biosed_out.fasta"/>
     </test>
-  </tests>
-  <code file="emboss_format_corrector.py" />
+  </tests>
   <help>
-
 .. class:: warningmark 
 
 The input dataset needs to be sequences. 
@@ -67,15 +62,8 @@
 ----- 
 
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/biosed.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/biosed.html
   </help>
+  <expand macro="citations" />
 </tool>
--- a/emboss_btwisted.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_btwisted.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,32 +1,26 @@
-<tool id="EMBOSS: btwisted5" name="btwisted" version="5.0.0">
-  <description>Calculates the twisting in a B-DNA sequence</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>btwisted -sequence $input1 -outfile $out_file1 -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>On query</label>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="btwisted" name="out_file1" />
+<tool id="EMBOSS: btwisted5" name="btwisted" version="5.0.0">
+  <description>Calculates the twisting in a B-DNA sequence</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <command>btwisted -sequence '$input1' -outfile '$out_file1' -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="On query" />
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="btwisted" />
   </outputs>
   <tests>
     <test>
       <param name="input1" value="2.fasta"/>
       <output name="out_file1" file="emboss_btwisted_out.btwisted"/>
     </test>
-  </tests>
+  </tests>
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/btwisted.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/btwisted.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_cai.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_cai.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,193 +1,186 @@
-<tool id="EMBOSS: cai6" name="cai" version="5.0.0">
-  <description>CAI codon adaptation index</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>cai -seqall '$input1' -outfile '$out_file1' -cfile '$cfile' -auto</command>
-  <inputs>
-    <param format="fasta" name="input1" type="data">
-      <label>On query</label>
-    </param>
-    <param name="cfile" type="select">
-      <label>Codon Usage File</label>
-      <option value="Eyeastcai.cut">Eyeastcai.cut</option>
-      <option value="Ehum.cut">Ehum.cut</option>
-      <option value="Eacc.cut">Eacc.cut</option>
-      <option value="Eadenovirus5.cut">Eadenovirus5.cut</option>
-      <option value="Eadenovirus7.cut">Eadenovirus7.cut</option>
-      <option value="Eaidlav.cut">Eaidlav.cut</option>
-      <option value="Eanasp.cut">Eanasp.cut</option>
-      <option value="Eani.cut">Eani.cut</option>
-      <option value="Eani_h.cut">Eani_h.cut</option>
-      <option value="Eanidmit.cut">Eanidmit.cut</option>
-      <option value="Easn.cut">Easn.cut</option>
-      <option value="Eath.cut">Eath.cut</option>
-      <option value="Eatu.cut">Eatu.cut</option>
-      <option value="Eavi.cut">Eavi.cut</option>
-      <option value="Ebja.cut">Ebja.cut</option>
-      <option value="Ebly.cut">Ebly.cut</option>
-      <option value="Ebme.cut">Ebme.cut</option>
-      <option value="Ebmo.cut">Ebmo.cut</option>
-      <option value="Ebna.cut">Ebna.cut</option>
-      <option value="Ebov.cut">Ebov.cut</option>
-      <option value="Ebovsp.cut">Ebovsp.cut</option>
-      <option value="Ebst.cut">Ebst.cut</option>
-      <option value="Ebsu.cut">Ebsu.cut</option>
-      <option value="Ebsu_h.cut">Ebsu_h.cut</option>
-      <option value="Ecac.cut">Ecac.cut</option>
-      <option value="Ecal.cut">Ecal.cut</option>
-      <option value="Eccr.cut">Eccr.cut</option>
-      <option value="Ecel.cut">Ecel.cut</option>
-      <option value="Echi.cut">Echi.cut</option>
-      <option value="Echicken.cut">Echicken.cut</option>
-      <option value="Echisp.cut">Echisp.cut</option>
-      <option value="Echk.cut">Echk.cut</option>
-      <option value="Echmp.cut">Echmp.cut</option>
-      <option value="Echnt.cut">Echnt.cut</option>
-      <option value="Echos.cut">Echos.cut</option>
-      <option value="Echzm.cut">Echzm.cut</option>
-      <option value="Echzmrubp.cut">Echzmrubp.cut</option>
-      <option value="Ecpx.cut">Ecpx.cut</option>
-      <option value="Ecre.cut">Ecre.cut</option>
-      <option value="Ecrisp.cut">Ecrisp.cut</option>
-      <option value="Ectr.cut">Ectr.cut</option>
-      <option value="Edayhoff.cut">Edayhoff.cut</option>
-      <option value="Eddi.cut">Eddi.cut</option>
-      <option value="Eddi_h.cut">Eddi_h.cut</option>
-      <option value="Edog.cut">Edog.cut</option>
-      <option value="Edro.cut">Edro.cut</option>
-      <option value="Edro_h.cut">Edro_h.cut</option>
-      <option value="Edrosophila.cut">Edrosophila.cut</option>
-      <option value="Eeca.cut">Eeca.cut</option>
-      <option value="Eeco.cut">Eeco.cut</option>
-      <option value="Eeco_h.cut">Eeco_h.cut</option>
-      <option value="Eecoli.cut">Eecoli.cut</option>
-      <option value="Ef1.cut">Ef1.cut</option>
-      <option value="Efish.cut">Efish.cut</option>
-      <option value="Efmdvpolyp.cut">Efmdvpolyp.cut</option>
-      <option value="Eham.cut">Eham.cut</option>
-      <option value="Ehha.cut">Ehha.cut</option>
-      <option value="Ehin.cut">Ehin.cut</option>
-      <option value="Ehma.cut">Ehma.cut</option>
-      <option value="Ehuman.cut">Ehuman.cut</option>
-      <option value="Ekla.cut">Ekla.cut</option>
-      <option value="Ekpn.cut">Ekpn.cut</option>
-      <option value="Ella.cut">Ella.cut</option>
-      <option value="Emac.cut">Emac.cut</option>
-      <option value="Emaize.cut">Emaize.cut</option>
-      <option value="Emam_h.cut">Emam_h.cut</option>
-      <option value="Emixlg.cut">Emixlg.cut</option>
-      <option value="Emouse.cut">Emouse.cut</option>
-      <option value="Emsa.cut">Emsa.cut</option>
-      <option value="Emse.cut">Emse.cut</option>
-      <option value="Emta.cut">Emta.cut</option>
-      <option value="Emtu.cut">Emtu.cut</option>
-      <option value="Emus.cut">Emus.cut</option>
-      <option value="Emussp.cut">Emussp.cut</option>
-      <option value="Emva.cut">Emva.cut</option>
-      <option value="Emze.cut">Emze.cut</option>
-      <option value="Emzecp.cut">Emzecp.cut</option>
-      <option value="Encr.cut">Encr.cut</option>
-      <option value="Eneu.cut">Eneu.cut</option>
-      <option value="Engo.cut">Engo.cut</option>
-      <option value="Eoncsp.cut">Eoncsp.cut</option>
-      <option value="Epae.cut">Epae.cut</option>
-      <option value="Epea.cut">Epea.cut</option>
-      <option value="Epet.cut">Epet.cut</option>
-      <option value="Epfa.cut">Epfa.cut</option>
-      <option value="Ephix174.cut">Ephix174.cut</option>
-      <option value="Ephv.cut">Ephv.cut</option>
-      <option value="Ephy.cut">Ephy.cut</option>
-      <option value="Epig.cut">Epig.cut</option>
-      <option value="Epolyomaa2.cut">Epolyomaa2.cut</option>
-      <option value="Epombe.cut">Epombe.cut</option>
-      <option value="Epombecai.cut">Epombecai.cut</option>
-      <option value="Epot.cut">Epot.cut</option>
-      <option value="Eppu.cut">Eppu.cut</option>
-      <option value="Epse.cut">Epse.cut</option>
-      <option value="Epsy.cut">Epsy.cut</option>
-      <option value="Epvu.cut">Epvu.cut</option>
-      <option value="Erab.cut">Erab.cut</option>
-      <option value="Erabbit.cut">Erabbit.cut</option>
-      <option value="Erabsp.cut">Erabsp.cut</option>
-      <option value="Erat.cut">Erat.cut</option>
-      <option value="Eratsp.cut">Eratsp.cut</option>
-      <option value="Erca.cut">Erca.cut</option>
-      <option value="Erhm.cut">Erhm.cut</option>
-      <option value="Eric.cut">Eric.cut</option>
-      <option value="Erle.cut">Erle.cut</option>
-      <option value="Erme.cut">Erme.cut</option>
-      <option value="Ersp.cut">Ersp.cut</option>
-      <option value="Esalsp.cut">Esalsp.cut</option>
-      <option value="Esau.cut">Esau.cut</option>
-      <option value="Esco.cut">Esco.cut</option>
-      <option value="Esgi.cut">Esgi.cut</option>
-      <option value="Eshp.cut">Eshp.cut</option>
-      <option value="Eshpsp.cut">Eshpsp.cut</option>
-      <option value="Esli.cut">Esli.cut</option>
-      <option value="Eslm.cut">Eslm.cut</option>
-      <option value="Esma.cut">Esma.cut</option>
-      <option value="Esmi.cut">Esmi.cut</option>
-      <option value="Esmu.cut">Esmu.cut</option>
-      <option value="Esoy.cut">Esoy.cut</option>
-      <option value="Espi.cut">Espi.cut</option>
-      <option value="Espn.cut">Espn.cut</option>
-      <option value="Espo.cut">Espo.cut</option>
-      <option value="Espo_h.cut">Espo_h.cut</option>
-      <option value="Espu.cut">Espu.cut</option>
-      <option value="Esta.cut">Esta.cut</option>
-      <option value="Esty.cut">Esty.cut</option>
-      <option value="Esus.cut">Esus.cut</option>
-      <option value="Esv40.cut">Esv40.cut</option>
-      <option value="Esyhsp.cut">Esyhsp.cut</option>
-      <option value="Esynsp.cut">Esynsp.cut</option>
-      <option value="Etbr.cut">Etbr.cut</option>
-      <option value="Etcr.cut">Etcr.cut</option>
-      <option value="Eter.cut">Eter.cut</option>
-      <option value="Etetsp.cut">Etetsp.cut</option>
-      <option value="Etob.cut">Etob.cut</option>
-      <option value="Etobcp.cut">Etobcp.cut</option>
-      <option value="Etom.cut">Etom.cut</option>
-      <option value="Etrb.cut">Etrb.cut</option>
-      <option value="Evco.cut">Evco.cut</option>
-      <option value="Ewht.cut">Ewht.cut</option>
-      <option value="Exel.cut">Exel.cut</option>
-      <option value="Exenopus.cut">Exenopus.cut</option>
-      <option value="Eyeast.cut">Eyeast.cut</option>
-      <option value="Eyen.cut">Eyen.cut</option>
-      <option value="Eysc.cut">Eysc.cut</option>
-      <option value="Eysc_h.cut">Eysc_h.cut</option>
-      <option value="Eyscmt.cut">Eyscmt.cut</option>
-      <option value="Eysp.cut">Eysp.cut</option>
-      <option value="Ezebrafish.cut">Ezebrafish.cut</option>
-      <option value="Ezma.cut">Ezma.cut</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="cai" name="out_file1" />
-  </outputs>
-  <tests>
-    <test>
-      <param name="input1" value="2.fasta"/>
-      <param name="cfile" value="Eyeastcai.cut"/>
-      <output name="out_file1" file="emboss_cai_out.cai"/>
-    </test>
-  </tests>
-  <help>
-.. class:: warningmark
-
-The input dataset needs to be sequences.
-
------
-
-    You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/cai.html
-
-------
-
-**Citation**
-
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
-  </help>
-</tool>
+<tool id="EMBOSS: cai6" name="cai" version="5.0.0">
+  <description>CAI codon adaptation index</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <command>cai -seqall '$input1' -outfile '$out_file1' -cfile $cfile -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="fasta" label="On query" />
+    <param name="cfile" type="select" label="Codon usage file">
+      <option value="Eyeastcai.cut">Eyeastcai.cut</option>
+      <option value="Ehum.cut">Ehum.cut</option>
+      <option value="Eacc.cut">Eacc.cut</option>
+      <option value="Eadenovirus5.cut">Eadenovirus5.cut</option>
+      <option value="Eadenovirus7.cut">Eadenovirus7.cut</option>
+      <option value="Eaidlav.cut">Eaidlav.cut</option>
+      <option value="Eanasp.cut">Eanasp.cut</option>
+      <option value="Eani.cut">Eani.cut</option>
+      <option value="Eani_h.cut">Eani_h.cut</option>
+      <option value="Eanidmit.cut">Eanidmit.cut</option>
+      <option value="Easn.cut">Easn.cut</option>
+      <option value="Eath.cut">Eath.cut</option>
+      <option value="Eatu.cut">Eatu.cut</option>
+      <option value="Eavi.cut">Eavi.cut</option>
+      <option value="Ebja.cut">Ebja.cut</option>
+      <option value="Ebly.cut">Ebly.cut</option>
+      <option value="Ebme.cut">Ebme.cut</option>
+      <option value="Ebmo.cut">Ebmo.cut</option>
+      <option value="Ebna.cut">Ebna.cut</option>
+      <option value="Ebov.cut">Ebov.cut</option>
+      <option value="Ebovsp.cut">Ebovsp.cut</option>
+      <option value="Ebst.cut">Ebst.cut</option>
+      <option value="Ebsu.cut">Ebsu.cut</option>
+      <option value="Ebsu_h.cut">Ebsu_h.cut</option>
+      <option value="Ecac.cut">Ecac.cut</option>
+      <option value="Ecal.cut">Ecal.cut</option>
+      <option value="Eccr.cut">Eccr.cut</option>
+      <option value="Ecel.cut">Ecel.cut</option>
+      <option value="Echi.cut">Echi.cut</option>
+      <option value="Echicken.cut">Echicken.cut</option>
+      <option value="Echisp.cut">Echisp.cut</option>
+      <option value="Echk.cut">Echk.cut</option>
+      <option value="Echmp.cut">Echmp.cut</option>
+      <option value="Echnt.cut">Echnt.cut</option>
+      <option value="Echos.cut">Echos.cut</option>
+      <option value="Echzm.cut">Echzm.cut</option>
+      <option value="Echzmrubp.cut">Echzmrubp.cut</option>
+      <option value="Ecpx.cut">Ecpx.cut</option>
+      <option value="Ecre.cut">Ecre.cut</option>
+      <option value="Ecrisp.cut">Ecrisp.cut</option>
+      <option value="Ectr.cut">Ectr.cut</option>
+      <option value="Edayhoff.cut">Edayhoff.cut</option>
+      <option value="Eddi.cut">Eddi.cut</option>
+      <option value="Eddi_h.cut">Eddi_h.cut</option>
+      <option value="Edog.cut">Edog.cut</option>
+      <option value="Edro.cut">Edro.cut</option>
+      <option value="Edro_h.cut">Edro_h.cut</option>
+      <option value="Edrosophila.cut">Edrosophila.cut</option>
+      <option value="Eeca.cut">Eeca.cut</option>
+      <option value="Eeco.cut">Eeco.cut</option>
+      <option value="Eeco_h.cut">Eeco_h.cut</option>
+      <option value="Eecoli.cut">Eecoli.cut</option>
+      <option value="Ef1.cut">Ef1.cut</option>
+      <option value="Efish.cut">Efish.cut</option>
+      <option value="Efmdvpolyp.cut">Efmdvpolyp.cut</option>
+      <option value="Eham.cut">Eham.cut</option>
+      <option value="Ehha.cut">Ehha.cut</option>
+      <option value="Ehin.cut">Ehin.cut</option>
+      <option value="Ehma.cut">Ehma.cut</option>
+      <option value="Ehuman.cut">Ehuman.cut</option>
+      <option value="Ekla.cut">Ekla.cut</option>
+      <option value="Ekpn.cut">Ekpn.cut</option>
+      <option value="Ella.cut">Ella.cut</option>
+      <option value="Emac.cut">Emac.cut</option>
+      <option value="Emaize.cut">Emaize.cut</option>
+      <option value="Emam_h.cut">Emam_h.cut</option>
+      <option value="Emixlg.cut">Emixlg.cut</option>
+      <option value="Emouse.cut">Emouse.cut</option>
+      <option value="Emsa.cut">Emsa.cut</option>
+      <option value="Emse.cut">Emse.cut</option>
+      <option value="Emta.cut">Emta.cut</option>
+      <option value="Emtu.cut">Emtu.cut</option>
+      <option value="Emus.cut">Emus.cut</option>
+      <option value="Emussp.cut">Emussp.cut</option>
+      <option value="Emva.cut">Emva.cut</option>
+      <option value="Emze.cut">Emze.cut</option>
+      <option value="Emzecp.cut">Emzecp.cut</option>
+      <option value="Encr.cut">Encr.cut</option>
+      <option value="Eneu.cut">Eneu.cut</option>
+      <option value="Engo.cut">Engo.cut</option>
+      <option value="Eoncsp.cut">Eoncsp.cut</option>
+      <option value="Epae.cut">Epae.cut</option>
+      <option value="Epea.cut">Epea.cut</option>
+      <option value="Epet.cut">Epet.cut</option>
+      <option value="Epfa.cut">Epfa.cut</option>
+      <option value="Ephix174.cut">Ephix174.cut</option>
+      <option value="Ephv.cut">Ephv.cut</option>
+      <option value="Ephy.cut">Ephy.cut</option>
+      <option value="Epig.cut">Epig.cut</option>
+      <option value="Epolyomaa2.cut">Epolyomaa2.cut</option>
+      <option value="Epombe.cut">Epombe.cut</option>
+      <option value="Epombecai.cut">Epombecai.cut</option>
+      <option value="Epot.cut">Epot.cut</option>
+      <option value="Eppu.cut">Eppu.cut</option>
+      <option value="Epse.cut">Epse.cut</option>
+      <option value="Epsy.cut">Epsy.cut</option>
+      <option value="Epvu.cut">Epvu.cut</option>
+      <option value="Erab.cut">Erab.cut</option>
+      <option value="Erabbit.cut">Erabbit.cut</option>
+      <option value="Erabsp.cut">Erabsp.cut</option>
+      <option value="Erat.cut">Erat.cut</option>
+      <option value="Eratsp.cut">Eratsp.cut</option>
+      <option value="Erca.cut">Erca.cut</option>
+      <option value="Erhm.cut">Erhm.cut</option>
+      <option value="Eric.cut">Eric.cut</option>
+      <option value="Erle.cut">Erle.cut</option>
+      <option value="Erme.cut">Erme.cut</option>
+      <option value="Ersp.cut">Ersp.cut</option>
+      <option value="Esalsp.cut">Esalsp.cut</option>
+      <option value="Esau.cut">Esau.cut</option>
+      <option value="Esco.cut">Esco.cut</option>
+      <option value="Esgi.cut">Esgi.cut</option>
+      <option value="Eshp.cut">Eshp.cut</option>
+      <option value="Eshpsp.cut">Eshpsp.cut</option>
+      <option value="Esli.cut">Esli.cut</option>
+      <option value="Eslm.cut">Eslm.cut</option>
+      <option value="Esma.cut">Esma.cut</option>
+      <option value="Esmi.cut">Esmi.cut</option>
+      <option value="Esmu.cut">Esmu.cut</option>
+      <option value="Esoy.cut">Esoy.cut</option>
+      <option value="Espi.cut">Espi.cut</option>
+      <option value="Espn.cut">Espn.cut</option>
+      <option value="Espo.cut">Espo.cut</option>
+      <option value="Espo_h.cut">Espo_h.cut</option>
+      <option value="Espu.cut">Espu.cut</option>
+      <option value="Esta.cut">Esta.cut</option>
+      <option value="Esty.cut">Esty.cut</option>
+      <option value="Esus.cut">Esus.cut</option>
+      <option value="Esv40.cut">Esv40.cut</option>
+      <option value="Esyhsp.cut">Esyhsp.cut</option>
+      <option value="Esynsp.cut">Esynsp.cut</option>
+      <option value="Etbr.cut">Etbr.cut</option>
+      <option value="Etcr.cut">Etcr.cut</option>
+      <option value="Eter.cut">Eter.cut</option>
+      <option value="Etetsp.cut">Etetsp.cut</option>
+      <option value="Etob.cut">Etob.cut</option>
+      <option value="Etobcp.cut">Etobcp.cut</option>
+      <option value="Etom.cut">Etom.cut</option>
+      <option value="Etrb.cut">Etrb.cut</option>
+      <option value="Evco.cut">Evco.cut</option>
+      <option value="Ewht.cut">Ewht.cut</option>
+      <option value="Exel.cut">Exel.cut</option>
+      <option value="Exenopus.cut">Exenopus.cut</option>
+      <option value="Eyeast.cut">Eyeast.cut</option>
+      <option value="Eyen.cut">Eyen.cut</option>
+      <option value="Eysc.cut">Eysc.cut</option>
+      <option value="Eysc_h.cut">Eysc_h.cut</option>
+      <option value="Eyscmt.cut">Eyscmt.cut</option>
+      <option value="Eysp.cut">Eysp.cut</option>
+      <option value="Ezebrafish.cut">Ezebrafish.cut</option>
+      <option value="Ezma.cut">Ezma.cut</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="cai" />
+  </outputs>
+  <tests>
+    <test>
+      <param name="input1" value="2.fasta"/>
+      <param name="cfile" value="Eyeastcai.cut"/>
+      <output name="out_file1" file="emboss_cai_out.cai"/>
+    </test>
+  </tests>
+  <help>
+.. class:: warningmark
+
+The input dataset needs to be sequences.
+
+-----
+
+    You can view the original documentation here_.
+
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/cai.html
+  </help>
+  <expand macro="citations" />
+</tool>
--- a/emboss_cai_custom.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_cai_custom.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,18 +1,17 @@
-<tool id="EMBOSS: cai_custom6" name="cai custom" version="5.0.0">
-  <description>CAI codon adaptation index using custom codon usage file</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>cai -seqall $input1 -outfile $out_file1 -cfile $input2 -auto</command>
-  <inputs>
-    <param format="fasta" name="input1" type="data">
-      <label>On query</label>
-    </param>
-    <param format="txt" name="input2" type="data">
-      <label>Codon Usage File</label>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="txt" name="out_file1" />
-  </outputs>
+<tool id="EMBOSS: cai_custom6" name="cai custom" version="5.0.0">
+  <description>CAI codon adaptation index using custom codon usage file</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <command>cai -seqall '$input1' -outfile '$out_file1' -cfile '$input2' -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="fasta" label="On query" />
+    <param name="input2" type="data" format="txt" label="Codon usage file" />
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="txt" />
+  </outputs>
   <help>
 .. class:: warningmark
 
@@ -21,15 +20,8 @@
 -----
 
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/cai_custom.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/cai.html
   </help>
+  <expand macro="citations" />
 </tool>
--- a/emboss_chaos.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_chaos.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,31 +1,25 @@
-<tool id="EMBOSS: chaos7" name="chaos" version="5.0.0">
-  <description>Create a chaos game representation plot for a sequence</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command interpreter="perl">emboss_single_outputfile_wrapper.pl chaos -sequence $input1 -graph png -goutfile $out_file1 -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>On query</label>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="png" name="out_file1" />
+<tool id="EMBOSS: chaos7" name="chaos" version="5.0.0">
+  <description>Create a chaos game representation plot for a sequence</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <command>perl '$__tool_directory__/emboss_single_outputfile_wrapper.pl' chaos -sequence '$input1' -graph png -goutfile '$out_file1' -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="On query" />
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="png" />
   </outputs>
 <!--    <tests>
     <test>
          puts name of file into the png
     </test>
-  </tests> -->
+  </tests> -->
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/chaos.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/chaos.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_charge.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_charge.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,17 +1,16 @@
-<tool id="EMBOSS: charge8" name="charge" version="5.0.0">
-  <description>Protein charge plot</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>charge -seqall $input1 -outfile $out_file1 -window $window -auto</command>
-  <inputs>
-    <param format="fasta" name="input1" type="data">
-      <label>On query</label>
-    </param>
-    <param name="window" type="text" value="5">
-      <label>Window Size</label>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="charge" name="out_file1" />
+<tool id="EMBOSS: charge8" name="charge" version="5.0.0.1">
+  <description>Protein charge plot</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <command>charge -seqall '$input1' -outfile '$out_file1' -window $window -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="fasta" label="On query" />
+    <param name="window" type="integer" value="5" label="Window size" />
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="charge" />
   </outputs>
  <!--   <tests>
     <test>
@@ -19,25 +18,17 @@
       <param name="window" value="5"/>
       <output name="out_file1" file="emboss_charge_out.charge"/>
     </test>
-  </tests>--> 
+  </tests>-->
   <help>
+.. class:: warningmark
 
-.. class:: warningmark 
+The input dataset needs to be sequences.
 
-The input dataset needs to be sequences. 
-
------ 
+-----
 
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/charge.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/charge.html
   </help>
+  <expand macro="citations" />
 </tool>
--- a/emboss_checktrans.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_checktrans.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,63 +1,59 @@
-<tool id="EMBOSS: checktrans9" name="checktrans" version="5.0.0">
-  <description>Reports STOP codons and ORF statistics of a protein</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>checktrans -sequence $input1 -outfile $out_file1 -outseq $out_file2 -osformat3 $out_format2 -outfeat $out_file3 -offormat4 $out_format3 -orfml $orfml -addlast $addlast -auto</command>
-  <inputs>
-    <param format="fasta" name="input1" type="data">
-      <label>On query</label>
-    </param>
-    <param name="orfml" type="text" value="100">
-      <label>Minimum ORF Length to report</label>
-    </param>
-    <param name="addlast" type="select">
-      <label>An asterisk in the protein sequence indicates the position of a STOP codon. Checktrans assumes that all ORFs end in a STOP codon. Forcing the sequence to end with an asterisk, if there
-      is not one there already, makes checktrans treat the end as a potential ORF. If an asterisk is added, it is not included in the reported count of STOPs</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="out_format2" type="select">
-      <label>Output Sequence File Format</label>
-      <option value="fasta">FASTA (m)</option>
-      <option value="acedb">ACeDB (m)</option>
-      <option value="asn1">ASN.1 (m)</option>
-      <option value="clustal">Clustal (m)</option>
-      <option value="codata">CODATA (m)</option>
-      <option value="embl">EMBL (m)</option>
-      <option value="fitch">Fitch (m)</option>
-      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
-      <option value="genbank">GENBANK (m)</option>
-      <option value="gff">GFF (m)</option>
-      <option value="hennig86">Hennig86 (m)</option>
-      <option value="ig">Intelligenetics (m)</option>
-      <option value="jackknifer">Jackknifer (m)</option>
-      <option value="jackknifernon">Jackknifernon (m)</option>
-      <option value="mega">Mega (m)</option>
-      <option value="meganon">Meganon (m)</option>
-      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
-      <option value="pir">NBRF (PIR) (m)</option>
-      <option value="ncbi">NCBI style FASTA (m)</option>
-      <option value="nexus">Nexus/PAUP (m)</option>
-      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
-      <option value="phylip">PHYLIP interleaved (m)</option>
-      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
-      <option value="selex">SELEX (m)</option>
-      <option value="staden">Staden (s)</option>
-      <option value="strider">DNA strider (m)</option>
-      <option value="swiss">SwisProt entry (m)</option>
-      <option value="text">Plain sequence (s)</option>
-      <option value="treecon">Treecon (m)</option>
-    </param>
-    <param name="out_format3" type="select">
-      <label>Output Feature File Format</label>
-      <option value="gff">GFF</option>
-      <option value="embl">EMBL</option>
-      <option value="swiss">SwissProt</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="checktrans" name="out_file1" />
-    <data format="fasta" name="out_file2" />
-    <data format="gff" name="out_file3" />
+<tool id="EMBOSS: checktrans9" name="checktrans" version="5.0.0.1">
+  <description>Reports STOP codons and ORF statistics of a protein</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>checktrans -sequence '$input1' -outfile '$out_file1' -outseq '$out_file2' -osformat3 $out_format2 -outfeat '$out_file3' -offormat4 $out_format3 -orfml $orfml -addlast $addlast -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="fasta" label="On query" />
+    <param name="orfml" type="integer" value="100" label="Minimum ORF length to report" />
+    <param name="addlast" type="select" label="An asterisk in the protein sequence indicates the position of a STOP codon" help="Checktrans assumes that all ORFs end in a STOP codon. Forcing the sequence to end with an asterisk, if there is not one there already, makes checktrans treat the end as a potential ORF. If an asterisk is added, it is not included in the reported count of STOPs">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="out_format2" type="select" label="Output sequence file format">
+      <option value="fasta">FASTA (m)</option>
+      <option value="acedb">ACeDB (m)</option>
+      <option value="asn1">ASN.1 (m)</option>
+      <option value="clustal">Clustal (m)</option>
+      <option value="codata">CODATA (m)</option>
+      <option value="embl">EMBL (m)</option>
+      <option value="fitch">Fitch (m)</option>
+      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
+      <option value="genbank">GENBANK (m)</option>
+      <option value="gff">GFF (m)</option>
+      <option value="hennig86">Hennig86 (m)</option>
+      <option value="ig">Intelligenetics (m)</option>
+      <option value="jackknifer">Jackknifer (m)</option>
+      <option value="jackknifernon">Jackknifernon (m)</option>
+      <option value="mega">Mega (m)</option>
+      <option value="meganon">Meganon (m)</option>
+      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
+      <option value="pir">NBRF (PIR) (m)</option>
+      <option value="ncbi">NCBI style FASTA (m)</option>
+      <option value="nexus">Nexus/PAUP (m)</option>
+      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
+      <option value="phylip">PHYLIP interleaved (m)</option>
+      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
+      <option value="selex">SELEX (m)</option>
+      <option value="staden">Staden (s)</option>
+      <option value="strider">DNA strider (m)</option>
+      <option value="swiss">SwisProt entry (m)</option>
+      <option value="text">Plain sequence (s)</option>
+      <option value="treecon">Treecon (m)</option>
+    </param>
+    <param name="out_format3" type="select" label="Output feature file format">
+      <option value="gff">GFF</option>
+      <option value="embl">EMBL</option>
+      <option value="swiss">SwissProt</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="checktrans" />
+    <data name="out_file2" format="fasta" />
+    <data name="out_file3" format="gff" />
   </outputs>
  <!--   <tests>
     <test>
@@ -70,26 +66,17 @@
       <output name="out_file2" file="emboss_checktrans_out2.fasta"/>
       <output name="out_file3" file="emboss_checktrans_out3.gff"/>
     </test>
-  </tests> -->
-  <code file="emboss_format_corrector.py" />
+  </tests> -->
   <help>
+.. class:: warningmark
 
-.. class:: warningmark 
+The input dataset needs to be sequences.
 
-The input dataset needs to be sequences. 
-
------ 
+-----
 
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/checktrans.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/checktrans.html
   </help>
+  <expand macro="citations" />
 </tool>
--- a/emboss_chips.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_chips.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,19 +1,19 @@
-<tool id="EMBOSS: chips10" name="chips" version="5.0.0">
-  <description>Codon usage statistics</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>chips -seqall $input1 -outfile $out_file1 -sum $sum -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>On query</label>
-    </param>
-    <param name="sum" type="select">
-      <label>Sum codons over all sequences</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="chips" name="out_file1" />
+<tool id="EMBOSS: chips10" name="chips" version="5.0.0">
+  <description>Codon usage statistics</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <command>chips -seqall '$input1' -outfile '$out_file1' -sum $sum -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="On query" />
+    <param name="sum" type="select" label="Sum codons over all sequences">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="chips" />
   </outputs>
   <tests>
     <test>
@@ -21,18 +21,11 @@
       <param name="sum" value="yes"/>
       <output name="out_file1" file="emboss_chips_out.chips"/>
     </test>
-  </tests>
+  </tests>
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/chips.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/chips.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_cirdna.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_cirdna.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,31 +1,25 @@
-<tool id="EMBOSS: cirdna11" name="cirdna" version="5.0.0">
-  <description>Draws circular maps of DNA constructs</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command interpreter="perl">emboss_single_outputfile_wrapper.pl cirdna -infile $input1 -graphout png -goutfile $out_file1 -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>On query</label>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="png" name="out_file1" />
+<tool id="EMBOSS: cirdna11" name="cirdna" version="5.0.0">
+  <description>Draws circular maps of DNA constructs</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <command>perl '$__tool_directory__/emboss_single_outputfile_wrapper.pl' cirdna -infile '$input1' -graphout png -goutfile '$out_file1' -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="On query" />
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="png" />
   </outputs>
   <!--    <tests>
     <test>
          puts name of file into the png
     </test>
-  </tests> -->
+  </tests> -->
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/cirdna.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/cirdna.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_codcmp.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_codcmp.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,319 +1,320 @@
-<tool id="EMBOSS: codcmp12" name="codcmp" version="5.0.0">
-  <description>Codon usage table comparison</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>codcmp -first $cfile1 -second $cfile2 -outfile $out_file1 -auto</command>
-  <inputs>
-    <param name="cfile1" type="select">
-      <label>Codon Usage File 1</label>
-      <option value="Ehum.cut">Ehum.cut</option>
-      <option value="Eacc.cut">Eacc.cut</option>
-      <option value="Eadenovirus5.cut">Eadenovirus5.cut</option>
-      <option value="Eadenovirus7.cut">Eadenovirus7.cut</option>
-      <option value="Eaidlav.cut">Eaidlav.cut</option>
-      <option value="Eanasp.cut">Eanasp.cut</option>
-      <option value="Eani.cut">Eani.cut</option>
-      <option value="Eani_h.cut">Eani_h.cut</option>
-      <option value="Eanidmit.cut">Eanidmit.cut</option>
-      <option value="Easn.cut">Easn.cut</option>
-      <option value="Eath.cut">Eath.cut</option>
-      <option value="Eatu.cut">Eatu.cut</option>
-      <option value="Eavi.cut">Eavi.cut</option>
-      <option value="Ebja.cut">Ebja.cut</option>
-      <option value="Ebly.cut">Ebly.cut</option>
-      <option value="Ebme.cut">Ebme.cut</option>
-      <option value="Ebmo.cut">Ebmo.cut</option>
-      <option value="Ebna.cut">Ebna.cut</option>
-      <option value="Ebov.cut">Ebov.cut</option>
-      <option value="Ebovsp.cut">Ebovsp.cut</option>
-      <option value="Ebst.cut">Ebst.cut</option>
-      <option value="Ebsu.cut">Ebsu.cut</option>
-      <option value="Ebsu_h.cut">Ebsu_h.cut</option>
-      <option value="Ecac.cut">Ecac.cut</option>
-      <option value="Ecal.cut">Ecal.cut</option>
-      <option value="Eccr.cut">Eccr.cut</option>
-      <option value="Ecel.cut">Ecel.cut</option>
-      <option value="Echi.cut">Echi.cut</option>
-      <option value="Echicken.cut">Echicken.cut</option>
-      <option value="Echisp.cut">Echisp.cut</option>
-      <option value="Echk.cut">Echk.cut</option>
-      <option value="Echmp.cut">Echmp.cut</option>
-      <option value="Echnt.cut">Echnt.cut</option>
-      <option value="Echos.cut">Echos.cut</option>
-      <option value="Echzm.cut">Echzm.cut</option>
-      <option value="Echzmrubp.cut">Echzmrubp.cut</option>
-      <option value="Ecpx.cut">Ecpx.cut</option>
-      <option value="Ecre.cut">Ecre.cut</option>
-      <option value="Ecrisp.cut">Ecrisp.cut</option>
-      <option value="Ectr.cut">Ectr.cut</option>
-      <option value="Edayhoff.cut">Edayhoff.cut</option>
-      <option value="Eddi.cut">Eddi.cut</option>
-      <option value="Eddi_h.cut">Eddi_h.cut</option>
-      <option value="Edog.cut">Edog.cut</option>
-      <option value="Edro.cut">Edro.cut</option>
-      <option value="Edro_h.cut">Edro_h.cut</option>
-      <option value="Edrosophila.cut">Edrosophila.cut</option>
-      <option value="Eeca.cut">Eeca.cut</option>
-      <option value="Eeco.cut">Eeco.cut</option>
-      <option value="Eeco_h.cut">Eeco_h.cut</option>
-      <option value="Eecoli.cut">Eecoli.cut</option>
-      <option value="Ef1.cut">Ef1.cut</option>
-      <option value="Efish.cut">Efish.cut</option>
-      <option value="Efmdvpolyp.cut">Efmdvpolyp.cut</option>
-      <option value="Eham.cut">Eham.cut</option>
-      <option value="Ehha.cut">Ehha.cut</option>
-      <option value="Ehin.cut">Ehin.cut</option>
-      <option value="Ehma.cut">Ehma.cut</option>
-      <option value="Ehuman.cut">Ehuman.cut</option>
-      <option value="Ekla.cut">Ekla.cut</option>
-      <option value="Ekpn.cut">Ekpn.cut</option>
-      <option value="Ella.cut">Ella.cut</option>
-      <option value="Emac.cut">Emac.cut</option>
-      <option value="Emaize.cut">Emaize.cut</option>
-      <option value="Emam_h.cut">Emam_h.cut</option>
-      <option value="Emixlg.cut">Emixlg.cut</option>
-      <option value="Emouse.cut">Emouse.cut</option>
-      <option value="Emsa.cut">Emsa.cut</option>
-      <option value="Emse.cut">Emse.cut</option>
-      <option value="Emta.cut">Emta.cut</option>
-      <option value="Emtu.cut">Emtu.cut</option>
-      <option value="Emus.cut">Emus.cut</option>
-      <option value="Emussp.cut">Emussp.cut</option>
-      <option value="Emva.cut">Emva.cut</option>
-      <option value="Emze.cut">Emze.cut</option>
-      <option value="Emzecp.cut">Emzecp.cut</option>
-      <option value="Encr.cut">Encr.cut</option>
-      <option value="Eneu.cut">Eneu.cut</option>
-      <option value="Engo.cut">Engo.cut</option>
-      <option value="Eoncsp.cut">Eoncsp.cut</option>
-      <option value="Epae.cut">Epae.cut</option>
-      <option value="Epea.cut">Epea.cut</option>
-      <option value="Epet.cut">Epet.cut</option>
-      <option value="Epfa.cut">Epfa.cut</option>
-      <option value="Ephix174.cut">Ephix174.cut</option>
-      <option value="Ephv.cut">Ephv.cut</option>
-      <option value="Ephy.cut">Ephy.cut</option>
-      <option value="Epig.cut">Epig.cut</option>
-      <option value="Epolyomaa2.cut">Epolyomaa2.cut</option>
-      <option value="Epombe.cut">Epombe.cut</option>
-      <option value="Epombecai.cut">Epombecai.cut</option>
-      <option value="Epot.cut">Epot.cut</option>
-      <option value="Eppu.cut">Eppu.cut</option>
-      <option value="Epse.cut">Epse.cut</option>
-      <option value="Epsy.cut">Epsy.cut</option>
-      <option value="Epvu.cut">Epvu.cut</option>
-      <option value="Erab.cut">Erab.cut</option>
-      <option value="Erabbit.cut">Erabbit.cut</option>
-      <option value="Erabsp.cut">Erabsp.cut</option>
-      <option value="Erat.cut">Erat.cut</option>
-      <option value="Eratsp.cut">Eratsp.cut</option>
-      <option value="Erca.cut">Erca.cut</option>
-      <option value="Erhm.cut">Erhm.cut</option>
-      <option value="Eric.cut">Eric.cut</option>
-      <option value="Erle.cut">Erle.cut</option>
-      <option value="Erme.cut">Erme.cut</option>
-      <option value="Ersp.cut">Ersp.cut</option>
-      <option value="Esalsp.cut">Esalsp.cut</option>
-      <option value="Esau.cut">Esau.cut</option>
-      <option value="Esco.cut">Esco.cut</option>
-      <option value="Esgi.cut">Esgi.cut</option>
-      <option value="Eshp.cut">Eshp.cut</option>
-      <option value="Eshpsp.cut">Eshpsp.cut</option>
-      <option value="Esli.cut">Esli.cut</option>
-      <option value="Eslm.cut">Eslm.cut</option>
-      <option value="Esma.cut">Esma.cut</option>
-      <option value="Esmi.cut">Esmi.cut</option>
-      <option value="Esmu.cut">Esmu.cut</option>
-      <option value="Esoy.cut">Esoy.cut</option>
-      <option value="Espi.cut">Espi.cut</option>
-      <option value="Espn.cut">Espn.cut</option>
-      <option value="Espo.cut">Espo.cut</option>
-      <option value="Espo_h.cut">Espo_h.cut</option>
-      <option value="Espu.cut">Espu.cut</option>
-      <option value="Esta.cut">Esta.cut</option>
-      <option value="Esty.cut">Esty.cut</option>
-      <option value="Esus.cut">Esus.cut</option>
-      <option value="Esv40.cut">Esv40.cut</option>
-      <option value="Esyhsp.cut">Esyhsp.cut</option>
-      <option value="Esynsp.cut">Esynsp.cut</option>
-      <option value="Etbr.cut">Etbr.cut</option>
-      <option value="Etcr.cut">Etcr.cut</option>
-      <option value="Eter.cut">Eter.cut</option>
-      <option value="Etetsp.cut">Etetsp.cut</option>
-      <option value="Etob.cut">Etob.cut</option>
-      <option value="Etobcp.cut">Etobcp.cut</option>
-      <option value="Etom.cut">Etom.cut</option>
-      <option value="Etrb.cut">Etrb.cut</option>
-      <option value="Evco.cut">Evco.cut</option>
-      <option value="Ewht.cut">Ewht.cut</option>
-      <option value="Exel.cut">Exel.cut</option>
-      <option value="Exenopus.cut">Exenopus.cut</option>
-      <option value="Eyeast.cut">Eyeast.cut</option>
-      <option value="Eyeastcai.cut">Eyeastcai.cut</option>
-      <option value="Eyen.cut">Eyen.cut</option>
-      <option value="Eysc.cut">Eysc.cut</option>
-      <option value="Eysc_h.cut">Eysc_h.cut</option>
-      <option value="Eyscmt.cut">Eyscmt.cut</option>
-      <option value="Eysp.cut">Eysp.cut</option>
-      <option value="Ezebrafish.cut">Ezebrafish.cut</option>
-      <option value="Ezma.cut">Ezma.cut</option>
-    </param>
-    <param name="cfile2" type="select">
-      <label>Codon Usage File 2</label>
-      <option value="Ehum.cut">Ehum.cut</option>
-      <option value="Eacc.cut">Eacc.cut</option>
-      <option value="Eadenovirus5.cut">Eadenovirus5.cut</option>
-      <option value="Eadenovirus7.cut">Eadenovirus7.cut</option>
-      <option value="Eaidlav.cut">Eaidlav.cut</option>
-      <option value="Eanasp.cut">Eanasp.cut</option>
-      <option value="Eani.cut">Eani.cut</option>
-      <option value="Eani_h.cut">Eani_h.cut</option>
-      <option value="Eanidmit.cut">Eanidmit.cut</option>
-      <option value="Easn.cut">Easn.cut</option>
-      <option value="Eath.cut">Eath.cut</option>
-      <option value="Eatu.cut">Eatu.cut</option>
-      <option value="Eavi.cut">Eavi.cut</option>
-      <option value="Ebja.cut">Ebja.cut</option>
-      <option value="Ebly.cut">Ebly.cut</option>
-      <option value="Ebme.cut">Ebme.cut</option>
-      <option value="Ebmo.cut">Ebmo.cut</option>
-      <option value="Ebna.cut">Ebna.cut</option>
-      <option value="Ebov.cut">Ebov.cut</option>
-      <option value="Ebovsp.cut">Ebovsp.cut</option>
-      <option value="Ebst.cut">Ebst.cut</option>
-      <option value="Ebsu.cut">Ebsu.cut</option>
-      <option value="Ebsu_h.cut">Ebsu_h.cut</option>
-      <option value="Ecac.cut">Ecac.cut</option>
-      <option value="Ecal.cut">Ecal.cut</option>
-      <option value="Eccr.cut">Eccr.cut</option>
-      <option value="Ecel.cut">Ecel.cut</option>
-      <option value="Echi.cut">Echi.cut</option>
-      <option value="Echicken.cut">Echicken.cut</option>
-      <option value="Echisp.cut">Echisp.cut</option>
-      <option value="Echk.cut">Echk.cut</option>
-      <option value="Echmp.cut">Echmp.cut</option>
-      <option value="Echnt.cut">Echnt.cut</option>
-      <option value="Echos.cut">Echos.cut</option>
-      <option value="Echzm.cut">Echzm.cut</option>
-      <option value="Echzmrubp.cut">Echzmrubp.cut</option>
-      <option value="Ecpx.cut">Ecpx.cut</option>
-      <option value="Ecre.cut">Ecre.cut</option>
-      <option value="Ecrisp.cut">Ecrisp.cut</option>
-      <option value="Ectr.cut">Ectr.cut</option>
-      <option value="Edayhoff.cut">Edayhoff.cut</option>
-      <option value="Eddi.cut">Eddi.cut</option>
-      <option value="Eddi_h.cut">Eddi_h.cut</option>
-      <option value="Edog.cut">Edog.cut</option>
-      <option value="Edro.cut">Edro.cut</option>
-      <option value="Edro_h.cut">Edro_h.cut</option>
-      <option value="Edrosophila.cut">Edrosophila.cut</option>
-      <option value="Eeca.cut">Eeca.cut</option>
-      <option value="Eeco.cut">Eeco.cut</option>
-      <option value="Eeco_h.cut">Eeco_h.cut</option>
-      <option value="Eecoli.cut">Eecoli.cut</option>
-      <option value="Ef1.cut">Ef1.cut</option>
-      <option value="Efish.cut">Efish.cut</option>
-      <option value="Efmdvpolyp.cut">Efmdvpolyp.cut</option>
-      <option value="Eham.cut">Eham.cut</option>
-      <option value="Ehha.cut">Ehha.cut</option>
-      <option value="Ehin.cut">Ehin.cut</option>
-      <option value="Ehma.cut">Ehma.cut</option>
-      <option value="Ehuman.cut">Ehuman.cut</option>
-      <option value="Ekla.cut">Ekla.cut</option>
-      <option value="Ekpn.cut">Ekpn.cut</option>
-      <option value="Ella.cut">Ella.cut</option>
-      <option value="Emac.cut">Emac.cut</option>
-      <option value="Emaize.cut">Emaize.cut</option>
-      <option value="Emam_h.cut">Emam_h.cut</option>
-      <option value="Emixlg.cut">Emixlg.cut</option>
-      <option value="Emouse.cut">Emouse.cut</option>
-      <option value="Emsa.cut">Emsa.cut</option>
-      <option value="Emse.cut">Emse.cut</option>
-      <option value="Emta.cut">Emta.cut</option>
-      <option value="Emtu.cut">Emtu.cut</option>
-      <option value="Emus.cut">Emus.cut</option>
-      <option value="Emussp.cut">Emussp.cut</option>
-      <option value="Emva.cut">Emva.cut</option>
-      <option value="Emze.cut">Emze.cut</option>
-      <option value="Emzecp.cut">Emzecp.cut</option>
-      <option value="Encr.cut">Encr.cut</option>
-      <option value="Eneu.cut">Eneu.cut</option>
-      <option value="Engo.cut">Engo.cut</option>
-      <option value="Eoncsp.cut">Eoncsp.cut</option>
-      <option value="Epae.cut">Epae.cut</option>
-      <option value="Epea.cut">Epea.cut</option>
-      <option value="Epet.cut">Epet.cut</option>
-      <option value="Epfa.cut">Epfa.cut</option>
-      <option value="Ephix174.cut">Ephix174.cut</option>
-      <option value="Ephv.cut">Ephv.cut</option>
-      <option value="Ephy.cut">Ephy.cut</option>
-      <option value="Epig.cut">Epig.cut</option>
-      <option value="Epolyomaa2.cut">Epolyomaa2.cut</option>
-      <option value="Epombe.cut">Epombe.cut</option>
-      <option value="Epombecai.cut">Epombecai.cut</option>
-      <option value="Epot.cut">Epot.cut</option>
-      <option value="Eppu.cut">Eppu.cut</option>
-      <option value="Epse.cut">Epse.cut</option>
-      <option value="Epsy.cut">Epsy.cut</option>
-      <option value="Epvu.cut">Epvu.cut</option>
-      <option value="Erab.cut">Erab.cut</option>
-      <option value="Erabbit.cut">Erabbit.cut</option>
-      <option value="Erabsp.cut">Erabsp.cut</option>
-      <option value="Erat.cut">Erat.cut</option>
-      <option value="Eratsp.cut">Eratsp.cut</option>
-      <option value="Erca.cut">Erca.cut</option>
-      <option value="Erhm.cut">Erhm.cut</option>
-      <option value="Eric.cut">Eric.cut</option>
-      <option value="Erle.cut">Erle.cut</option>
-      <option value="Erme.cut">Erme.cut</option>
-      <option value="Ersp.cut">Ersp.cut</option>
-      <option value="Esalsp.cut">Esalsp.cut</option>
-      <option value="Esau.cut">Esau.cut</option>
-      <option value="Esco.cut">Esco.cut</option>
-      <option value="Esgi.cut">Esgi.cut</option>
-      <option value="Eshp.cut">Eshp.cut</option>
-      <option value="Eshpsp.cut">Eshpsp.cut</option>
-      <option value="Esli.cut">Esli.cut</option>
-      <option value="Eslm.cut">Eslm.cut</option>
-      <option value="Esma.cut">Esma.cut</option>
-      <option value="Esmi.cut">Esmi.cut</option>
-      <option value="Esmu.cut">Esmu.cut</option>
-      <option value="Esoy.cut">Esoy.cut</option>
-      <option value="Espi.cut">Espi.cut</option>
-      <option value="Espn.cut">Espn.cut</option>
-      <option value="Espo.cut">Espo.cut</option>
-      <option value="Espo_h.cut">Espo_h.cut</option>
-      <option value="Espu.cut">Espu.cut</option>
-      <option value="Esta.cut">Esta.cut</option>
-      <option value="Esty.cut">Esty.cut</option>
-      <option value="Esus.cut">Esus.cut</option>
-      <option value="Esv40.cut">Esv40.cut</option>
-      <option value="Esyhsp.cut">Esyhsp.cut</option>
-      <option value="Esynsp.cut">Esynsp.cut</option>
-      <option value="Etbr.cut">Etbr.cut</option>
-      <option value="Etcr.cut">Etcr.cut</option>
-      <option value="Eter.cut">Eter.cut</option>
-      <option value="Etetsp.cut">Etetsp.cut</option>
-      <option value="Etob.cut">Etob.cut</option>
-      <option value="Etobcp.cut">Etobcp.cut</option>
-      <option value="Etom.cut">Etom.cut</option>
-      <option value="Etrb.cut">Etrb.cut</option>
-      <option value="Evco.cut">Evco.cut</option>
-      <option value="Ewht.cut">Ewht.cut</option>
-      <option value="Exel.cut">Exel.cut</option>
-      <option value="Exenopus.cut">Exenopus.cut</option>
-      <option value="Eyeast.cut">Eyeast.cut</option>
-      <option value="Eyeastcai.cut">Eyeastcai.cut</option>
-      <option value="Eyen.cut">Eyen.cut</option>
-      <option value="Eysc.cut">Eysc.cut</option>
-      <option value="Eysc_h.cut">Eysc_h.cut</option>
-      <option value="Eyscmt.cut">Eyscmt.cut</option>
-      <option value="Eysp.cut">Eysp.cut</option>
-      <option value="Ezebrafish.cut">Ezebrafish.cut</option>
-      <option value="Ezma.cut">Ezma.cut</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="codcmp" name="out_file1" />
+<tool id="EMBOSS: codcmp12" name="codcmp" version="5.0.0">
+  <description>Codon usage table comparison</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <command>codcmp -first $cfile1 -second $cfile2 -outfile '$out_file1' -auto</command>
+  <inputs>
+    <param name="cfile1" type="select" label="Codon usage file 1">
+      <option value="Ehum.cut">Ehum.cut</option>
+      <option value="Eacc.cut">Eacc.cut</option>
+      <option value="Eadenovirus5.cut">Eadenovirus5.cut</option>
+      <option value="Eadenovirus7.cut">Eadenovirus7.cut</option>
+      <option value="Eaidlav.cut">Eaidlav.cut</option>
+      <option value="Eanasp.cut">Eanasp.cut</option>
+      <option value="Eani.cut">Eani.cut</option>
+      <option value="Eani_h.cut">Eani_h.cut</option>
+      <option value="Eanidmit.cut">Eanidmit.cut</option>
+      <option value="Easn.cut">Easn.cut</option>
+      <option value="Eath.cut">Eath.cut</option>
+      <option value="Eatu.cut">Eatu.cut</option>
+      <option value="Eavi.cut">Eavi.cut</option>
+      <option value="Ebja.cut">Ebja.cut</option>
+      <option value="Ebly.cut">Ebly.cut</option>
+      <option value="Ebme.cut">Ebme.cut</option>
+      <option value="Ebmo.cut">Ebmo.cut</option>
+      <option value="Ebna.cut">Ebna.cut</option>
+      <option value="Ebov.cut">Ebov.cut</option>
+      <option value="Ebovsp.cut">Ebovsp.cut</option>
+      <option value="Ebst.cut">Ebst.cut</option>
+      <option value="Ebsu.cut">Ebsu.cut</option>
+      <option value="Ebsu_h.cut">Ebsu_h.cut</option>
+      <option value="Ecac.cut">Ecac.cut</option>
+      <option value="Ecal.cut">Ecal.cut</option>
+      <option value="Eccr.cut">Eccr.cut</option>
+      <option value="Ecel.cut">Ecel.cut</option>
+      <option value="Echi.cut">Echi.cut</option>
+      <option value="Echicken.cut">Echicken.cut</option>
+      <option value="Echisp.cut">Echisp.cut</option>
+      <option value="Echk.cut">Echk.cut</option>
+      <option value="Echmp.cut">Echmp.cut</option>
+      <option value="Echnt.cut">Echnt.cut</option>
+      <option value="Echos.cut">Echos.cut</option>
+      <option value="Echzm.cut">Echzm.cut</option>
+      <option value="Echzmrubp.cut">Echzmrubp.cut</option>
+      <option value="Ecpx.cut">Ecpx.cut</option>
+      <option value="Ecre.cut">Ecre.cut</option>
+      <option value="Ecrisp.cut">Ecrisp.cut</option>
+      <option value="Ectr.cut">Ectr.cut</option>
+      <option value="Edayhoff.cut">Edayhoff.cut</option>
+      <option value="Eddi.cut">Eddi.cut</option>
+      <option value="Eddi_h.cut">Eddi_h.cut</option>
+      <option value="Edog.cut">Edog.cut</option>
+      <option value="Edro.cut">Edro.cut</option>
+      <option value="Edro_h.cut">Edro_h.cut</option>
+      <option value="Edrosophila.cut">Edrosophila.cut</option>
+      <option value="Eeca.cut">Eeca.cut</option>
+      <option value="Eeco.cut">Eeco.cut</option>
+      <option value="Eeco_h.cut">Eeco_h.cut</option>
+      <option value="Eecoli.cut">Eecoli.cut</option>
+      <option value="Ef1.cut">Ef1.cut</option>
+      <option value="Efish.cut">Efish.cut</option>
+      <option value="Efmdvpolyp.cut">Efmdvpolyp.cut</option>
+      <option value="Eham.cut">Eham.cut</option>
+      <option value="Ehha.cut">Ehha.cut</option>
+      <option value="Ehin.cut">Ehin.cut</option>
+      <option value="Ehma.cut">Ehma.cut</option>
+      <option value="Ehuman.cut">Ehuman.cut</option>
+      <option value="Ekla.cut">Ekla.cut</option>
+      <option value="Ekpn.cut">Ekpn.cut</option>
+      <option value="Ella.cut">Ella.cut</option>
+      <option value="Emac.cut">Emac.cut</option>
+      <option value="Emaize.cut">Emaize.cut</option>
+      <option value="Emam_h.cut">Emam_h.cut</option>
+      <option value="Emixlg.cut">Emixlg.cut</option>
+      <option value="Emouse.cut">Emouse.cut</option>
+      <option value="Emsa.cut">Emsa.cut</option>
+      <option value="Emse.cut">Emse.cut</option>
+      <option value="Emta.cut">Emta.cut</option>
+      <option value="Emtu.cut">Emtu.cut</option>
+      <option value="Emus.cut">Emus.cut</option>
+      <option value="Emussp.cut">Emussp.cut</option>
+      <option value="Emva.cut">Emva.cut</option>
+      <option value="Emze.cut">Emze.cut</option>
+      <option value="Emzecp.cut">Emzecp.cut</option>
+      <option value="Encr.cut">Encr.cut</option>
+      <option value="Eneu.cut">Eneu.cut</option>
+      <option value="Engo.cut">Engo.cut</option>
+      <option value="Eoncsp.cut">Eoncsp.cut</option>
+      <option value="Epae.cut">Epae.cut</option>
+      <option value="Epea.cut">Epea.cut</option>
+      <option value="Epet.cut">Epet.cut</option>
+      <option value="Epfa.cut">Epfa.cut</option>
+      <option value="Ephix174.cut">Ephix174.cut</option>
+      <option value="Ephv.cut">Ephv.cut</option>
+      <option value="Ephy.cut">Ephy.cut</option>
+      <option value="Epig.cut">Epig.cut</option>
+      <option value="Epolyomaa2.cut">Epolyomaa2.cut</option>
+      <option value="Epombe.cut">Epombe.cut</option>
+      <option value="Epombecai.cut">Epombecai.cut</option>
+      <option value="Epot.cut">Epot.cut</option>
+      <option value="Eppu.cut">Eppu.cut</option>
+      <option value="Epse.cut">Epse.cut</option>
+      <option value="Epsy.cut">Epsy.cut</option>
+      <option value="Epvu.cut">Epvu.cut</option>
+      <option value="Erab.cut">Erab.cut</option>
+      <option value="Erabbit.cut">Erabbit.cut</option>
+      <option value="Erabsp.cut">Erabsp.cut</option>
+      <option value="Erat.cut">Erat.cut</option>
+      <option value="Eratsp.cut">Eratsp.cut</option>
+      <option value="Erca.cut">Erca.cut</option>
+      <option value="Erhm.cut">Erhm.cut</option>
+      <option value="Eric.cut">Eric.cut</option>
+      <option value="Erle.cut">Erle.cut</option>
+      <option value="Erme.cut">Erme.cut</option>
+      <option value="Ersp.cut">Ersp.cut</option>
+      <option value="Esalsp.cut">Esalsp.cut</option>
+      <option value="Esau.cut">Esau.cut</option>
+      <option value="Esco.cut">Esco.cut</option>
+      <option value="Esgi.cut">Esgi.cut</option>
+      <option value="Eshp.cut">Eshp.cut</option>
+      <option value="Eshpsp.cut">Eshpsp.cut</option>
+      <option value="Esli.cut">Esli.cut</option>
+      <option value="Eslm.cut">Eslm.cut</option>
+      <option value="Esma.cut">Esma.cut</option>
+      <option value="Esmi.cut">Esmi.cut</option>
+      <option value="Esmu.cut">Esmu.cut</option>
+      <option value="Esoy.cut">Esoy.cut</option>
+      <option value="Espi.cut">Espi.cut</option>
+      <option value="Espn.cut">Espn.cut</option>
+      <option value="Espo.cut">Espo.cut</option>
+      <option value="Espo_h.cut">Espo_h.cut</option>
+      <option value="Espu.cut">Espu.cut</option>
+      <option value="Esta.cut">Esta.cut</option>
+      <option value="Esty.cut">Esty.cut</option>
+      <option value="Esus.cut">Esus.cut</option>
+      <option value="Esv40.cut">Esv40.cut</option>
+      <option value="Esyhsp.cut">Esyhsp.cut</option>
+      <option value="Esynsp.cut">Esynsp.cut</option>
+      <option value="Etbr.cut">Etbr.cut</option>
+      <option value="Etcr.cut">Etcr.cut</option>
+      <option value="Eter.cut">Eter.cut</option>
+      <option value="Etetsp.cut">Etetsp.cut</option>
+      <option value="Etob.cut">Etob.cut</option>
+      <option value="Etobcp.cut">Etobcp.cut</option>
+      <option value="Etom.cut">Etom.cut</option>
+      <option value="Etrb.cut">Etrb.cut</option>
+      <option value="Evco.cut">Evco.cut</option>
+      <option value="Ewht.cut">Ewht.cut</option>
+      <option value="Exel.cut">Exel.cut</option>
+      <option value="Exenopus.cut">Exenopus.cut</option>
+      <option value="Eyeast.cut">Eyeast.cut</option>
+      <option value="Eyeastcai.cut">Eyeastcai.cut</option>
+      <option value="Eyen.cut">Eyen.cut</option>
+      <option value="Eysc.cut">Eysc.cut</option>
+      <option value="Eysc_h.cut">Eysc_h.cut</option>
+      <option value="Eyscmt.cut">Eyscmt.cut</option>
+      <option value="Eysp.cut">Eysp.cut</option>
+      <option value="Ezebrafish.cut">Ezebrafish.cut</option>
+      <option value="Ezma.cut">Ezma.cut</option>
+    </param>
+    <param name="cfile2" type="select" label="Codon usage file 2">
+      <option value="Ehum.cut">Ehum.cut</option>
+      <option value="Eacc.cut">Eacc.cut</option>
+      <option value="Eadenovirus5.cut">Eadenovirus5.cut</option>
+      <option value="Eadenovirus7.cut">Eadenovirus7.cut</option>
+      <option value="Eaidlav.cut">Eaidlav.cut</option>
+      <option value="Eanasp.cut">Eanasp.cut</option>
+      <option value="Eani.cut">Eani.cut</option>
+      <option value="Eani_h.cut">Eani_h.cut</option>
+      <option value="Eanidmit.cut">Eanidmit.cut</option>
+      <option value="Easn.cut">Easn.cut</option>
+      <option value="Eath.cut">Eath.cut</option>
+      <option value="Eatu.cut">Eatu.cut</option>
+      <option value="Eavi.cut">Eavi.cut</option>
+      <option value="Ebja.cut">Ebja.cut</option>
+      <option value="Ebly.cut">Ebly.cut</option>
+      <option value="Ebme.cut">Ebme.cut</option>
+      <option value="Ebmo.cut">Ebmo.cut</option>
+      <option value="Ebna.cut">Ebna.cut</option>
+      <option value="Ebov.cut">Ebov.cut</option>
+      <option value="Ebovsp.cut">Ebovsp.cut</option>
+      <option value="Ebst.cut">Ebst.cut</option>
+      <option value="Ebsu.cut">Ebsu.cut</option>
+      <option value="Ebsu_h.cut">Ebsu_h.cut</option>
+      <option value="Ecac.cut">Ecac.cut</option>
+      <option value="Ecal.cut">Ecal.cut</option>
+      <option value="Eccr.cut">Eccr.cut</option>
+      <option value="Ecel.cut">Ecel.cut</option>
+      <option value="Echi.cut">Echi.cut</option>
+      <option value="Echicken.cut">Echicken.cut</option>
+      <option value="Echisp.cut">Echisp.cut</option>
+      <option value="Echk.cut">Echk.cut</option>
+      <option value="Echmp.cut">Echmp.cut</option>
+      <option value="Echnt.cut">Echnt.cut</option>
+      <option value="Echos.cut">Echos.cut</option>
+      <option value="Echzm.cut">Echzm.cut</option>
+      <option value="Echzmrubp.cut">Echzmrubp.cut</option>
+      <option value="Ecpx.cut">Ecpx.cut</option>
+      <option value="Ecre.cut">Ecre.cut</option>
+      <option value="Ecrisp.cut">Ecrisp.cut</option>
+      <option value="Ectr.cut">Ectr.cut</option>
+      <option value="Edayhoff.cut">Edayhoff.cut</option>
+      <option value="Eddi.cut">Eddi.cut</option>
+      <option value="Eddi_h.cut">Eddi_h.cut</option>
+      <option value="Edog.cut">Edog.cut</option>
+      <option value="Edro.cut">Edro.cut</option>
+      <option value="Edro_h.cut">Edro_h.cut</option>
+      <option value="Edrosophila.cut">Edrosophila.cut</option>
+      <option value="Eeca.cut">Eeca.cut</option>
+      <option value="Eeco.cut">Eeco.cut</option>
+      <option value="Eeco_h.cut">Eeco_h.cut</option>
+      <option value="Eecoli.cut">Eecoli.cut</option>
+      <option value="Ef1.cut">Ef1.cut</option>
+      <option value="Efish.cut">Efish.cut</option>
+      <option value="Efmdvpolyp.cut">Efmdvpolyp.cut</option>
+      <option value="Eham.cut">Eham.cut</option>
+      <option value="Ehha.cut">Ehha.cut</option>
+      <option value="Ehin.cut">Ehin.cut</option>
+      <option value="Ehma.cut">Ehma.cut</option>
+      <option value="Ehuman.cut">Ehuman.cut</option>
+      <option value="Ekla.cut">Ekla.cut</option>
+      <option value="Ekpn.cut">Ekpn.cut</option>
+      <option value="Ella.cut">Ella.cut</option>
+      <option value="Emac.cut">Emac.cut</option>
+      <option value="Emaize.cut">Emaize.cut</option>
+      <option value="Emam_h.cut">Emam_h.cut</option>
+      <option value="Emixlg.cut">Emixlg.cut</option>
+      <option value="Emouse.cut">Emouse.cut</option>
+      <option value="Emsa.cut">Emsa.cut</option>
+      <option value="Emse.cut">Emse.cut</option>
+      <option value="Emta.cut">Emta.cut</option>
+      <option value="Emtu.cut">Emtu.cut</option>
+      <option value="Emus.cut">Emus.cut</option>
+      <option value="Emussp.cut">Emussp.cut</option>
+      <option value="Emva.cut">Emva.cut</option>
+      <option value="Emze.cut">Emze.cut</option>
+      <option value="Emzecp.cut">Emzecp.cut</option>
+      <option value="Encr.cut">Encr.cut</option>
+      <option value="Eneu.cut">Eneu.cut</option>
+      <option value="Engo.cut">Engo.cut</option>
+      <option value="Eoncsp.cut">Eoncsp.cut</option>
+      <option value="Epae.cut">Epae.cut</option>
+      <option value="Epea.cut">Epea.cut</option>
+      <option value="Epet.cut">Epet.cut</option>
+      <option value="Epfa.cut">Epfa.cut</option>
+      <option value="Ephix174.cut">Ephix174.cut</option>
+      <option value="Ephv.cut">Ephv.cut</option>
+      <option value="Ephy.cut">Ephy.cut</option>
+      <option value="Epig.cut">Epig.cut</option>
+      <option value="Epolyomaa2.cut">Epolyomaa2.cut</option>
+      <option value="Epombe.cut">Epombe.cut</option>
+      <option value="Epombecai.cut">Epombecai.cut</option>
+      <option value="Epot.cut">Epot.cut</option>
+      <option value="Eppu.cut">Eppu.cut</option>
+      <option value="Epse.cut">Epse.cut</option>
+      <option value="Epsy.cut">Epsy.cut</option>
+      <option value="Epvu.cut">Epvu.cut</option>
+      <option value="Erab.cut">Erab.cut</option>
+      <option value="Erabbit.cut">Erabbit.cut</option>
+      <option value="Erabsp.cut">Erabsp.cut</option>
+      <option value="Erat.cut">Erat.cut</option>
+      <option value="Eratsp.cut">Eratsp.cut</option>
+      <option value="Erca.cut">Erca.cut</option>
+      <option value="Erhm.cut">Erhm.cut</option>
+      <option value="Eric.cut">Eric.cut</option>
+      <option value="Erle.cut">Erle.cut</option>
+      <option value="Erme.cut">Erme.cut</option>
+      <option value="Ersp.cut">Ersp.cut</option>
+      <option value="Esalsp.cut">Esalsp.cut</option>
+      <option value="Esau.cut">Esau.cut</option>
+      <option value="Esco.cut">Esco.cut</option>
+      <option value="Esgi.cut">Esgi.cut</option>
+      <option value="Eshp.cut">Eshp.cut</option>
+      <option value="Eshpsp.cut">Eshpsp.cut</option>
+      <option value="Esli.cut">Esli.cut</option>
+      <option value="Eslm.cut">Eslm.cut</option>
+      <option value="Esma.cut">Esma.cut</option>
+      <option value="Esmi.cut">Esmi.cut</option>
+      <option value="Esmu.cut">Esmu.cut</option>
+      <option value="Esoy.cut">Esoy.cut</option>
+      <option value="Espi.cut">Espi.cut</option>
+      <option value="Espn.cut">Espn.cut</option>
+      <option value="Espo.cut">Espo.cut</option>
+      <option value="Espo_h.cut">Espo_h.cut</option>
+      <option value="Espu.cut">Espu.cut</option>
+      <option value="Esta.cut">Esta.cut</option>
+      <option value="Esty.cut">Esty.cut</option>
+      <option value="Esus.cut">Esus.cut</option>
+      <option value="Esv40.cut">Esv40.cut</option>
+      <option value="Esyhsp.cut">Esyhsp.cut</option>
+      <option value="Esynsp.cut">Esynsp.cut</option>
+      <option value="Etbr.cut">Etbr.cut</option>
+      <option value="Etcr.cut">Etcr.cut</option>
+      <option value="Eter.cut">Eter.cut</option>
+      <option value="Etetsp.cut">Etetsp.cut</option>
+      <option value="Etob.cut">Etob.cut</option>
+      <option value="Etobcp.cut">Etobcp.cut</option>
+      <option value="Etom.cut">Etom.cut</option>
+      <option value="Etrb.cut">Etrb.cut</option>
+      <option value="Evco.cut">Evco.cut</option>
+      <option value="Ewht.cut">Ewht.cut</option>
+      <option value="Exel.cut">Exel.cut</option>
+      <option value="Exenopus.cut">Exenopus.cut</option>
+      <option value="Eyeast.cut">Eyeast.cut</option>
+      <option value="Eyeastcai.cut">Eyeastcai.cut</option>
+      <option value="Eyen.cut">Eyen.cut</option>
+      <option value="Eysc.cut">Eysc.cut</option>
+      <option value="Eysc_h.cut">Eysc_h.cut</option>
+      <option value="Eyscmt.cut">Eyscmt.cut</option>
+      <option value="Eysp.cut">Eysp.cut</option>
+      <option value="Ezebrafish.cut">Ezebrafish.cut</option>
+      <option value="Ezma.cut">Ezma.cut</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="codcmp" />
   </outputs>
   <tests>
     <test>
@@ -321,18 +322,11 @@
       <param name="cfile2" value="Eacc.cut"/>
       <output name="out_file1" file="emboss_codcmp_out.codcmp"/>
     </test>
-  </tests>
+  </tests>
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/codcmp.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/codcmp.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_coderet.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_coderet.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,81 +1,70 @@
-<tool id="EMBOSS: coderet13" name="coderet" version="5.0.0">
-  <description>Extract CDS, mRNA and translations from feature tables</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <!--  <command>coderet -seqall $input1 -outfile $out_file1 -osformat2 $out_format1 -cds $cds -mrna $mrna -translation $translation -auto</command>-->
-  <command>coderet -seqall $input1 -outfile $out_file1 -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>On query</label>
-    </param>
-    <!--
-    <param name="cds" type="boolean" truevalue="yes" falsevalue="no" checked="true">
-      <label>Extract CDS sequences</label>
-    </param>
-    <param name="mrna" type="select">
-      <label>Extract mRNA sequences</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="translation" type="select">
-      <label>Extract translated sequences</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param> 
-    <param name="out_format1" type="select">
-      <label>Output Sequence File Format</label>
-      <option value="fasta">FASTA (m)</option>
-      <option value="acedb">ACeDB (m)</option>
-      <option value="asn1">ASN.1 (m)</option>
-      <option value="clustal">Clustal (m)</option>
-      <option value="codata">CODATA (m)</option>
-      <option value="embl">EMBL (m)</option>
-      <option value="fitch">Fitch (m)</option>
-      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
-      <option value="genbank">GENBANK (m)</option>
-      <option value="gff">GFF (m)</option>
-      <option value="hennig86">Hennig86 (m)</option>
-      <option value="ig">Intelligenetics (m)</option>
-      <option value="jackknifer">Jackknifer (m)</option>
-      <option value="jackknifernon">Jackknifernon (m)</option>
-      <option value="mega">Mega (m)</option>
-      <option value="meganon">Meganon (m)</option>
-      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
-      <option value="pir">NBRF (PIR) (m)</option>
-      <option value="ncbi">NCBI style FASTA (m)</option>
-      <option value="nexus">Nexus/PAUP (m)</option>
-      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
-      <option value="phylip">PHYLIP interleaved (m)</option>
-      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
-      <option value="selex">SELEX (m)</option>
-      <option value="staden">Staden (s)</option>
-      <option value="strider">DNA strider (m)</option>
-      <option value="swiss">SwisProt entry (m)</option>
-      <option value="text">Plain sequence (s)</option>
-      <option value="treecon">Treecon (m)</option> 
-    </param> 
-    -->
-  </inputs>
-  <outputs>
-    <data format="coderet" name="out_file1" />
+<tool id="EMBOSS: coderet13" name="coderet" version="5.0.0">
+  <description>Extract CDS, mRNA and translations from feature tables</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <!--  <command>coderet -seqall '$input1' -outfile '$out_file1' -osformat2 $out_format1 -cds $cds -mrna $mrna -translation $translation -auto</command>-->
+  <command>coderet -seqall '$input1' -outfile '$out_file1' -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="On query" />
+    <!--
+    <param name="cds" type="boolean" truevalue="yes" falsevalue="no" checked="true" label="Extract CDS sequences" />
+    <param name="mrna" type="select" label="Extract mRNA sequences">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="translation" type="select" label="Extract translated sequences">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="out_format1" type="select" label="Output sequence file format">
+      <option value="fasta">FASTA (m)</option>
+      <option value="acedb">ACeDB (m)</option>
+      <option value="asn1">ASN.1 (m)</option>
+      <option value="clustal">Clustal (m)</option>
+      <option value="codata">CODATA (m)</option>
+      <option value="embl">EMBL (m)</option>
+      <option value="fitch">Fitch (m)</option>
+      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
+      <option value="genbank">GENBANK (m)</option>
+      <option value="gff">GFF (m)</option>
+      <option value="hennig86">Hennig86 (m)</option>
+      <option value="ig">Intelligenetics (m)</option>
+      <option value="jackknifer">Jackknifer (m)</option>
+      <option value="jackknifernon">Jackknifernon (m)</option>
+      <option value="mega">Mega (m)</option>
+      <option value="meganon">Meganon (m)</option>
+      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
+      <option value="pir">NBRF (PIR) (m)</option>
+      <option value="ncbi">NCBI style FASTA (m)</option>
+      <option value="nexus">Nexus/PAUP (m)</option>
+      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
+      <option value="phylip">PHYLIP interleaved (m)</option>
+      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
+      <option value="selex">SELEX (m)</option>
+      <option value="staden">Staden (s)</option>
+      <option value="strider">DNA strider (m)</option>
+      <option value="swiss">SwisProt entry (m)</option>
+      <option value="text">Plain sequence (s)</option>
+      <option value="treecon">Treecon (m)</option>
+    </param>
+    -->
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="coderet" />
   </outputs>
   <tests>
     <test>
       <param name="input1" value="2.fasta"/>
       <output name="out_file1" file="emboss_coderet_out.coderet"/>
     </test>
-  </tests>
-  <code file="emboss_format_corrector.py" />
+  </tests>
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/coderet.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/coderet.html
   </help>
-</tool>
+  <expand macro="citations" />
+</tool>
--- a/emboss_compseq.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_compseq.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,24 +1,22 @@
-<tool id="EMBOSS: compseq14" name="compseq" version="5.0.0">
-  <description>Count composition of dimer/trimer/etc words in a sequence</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>compseq -sequence $input1 -outfile $out_file1 -word $word -frame $frame -auto</command>
-  <inputs>
-    <param format="fasta" name="input1" type="data">
-      <label>On query</label>
-    </param>
-    <param name="word" type="text" value="2">
-      <label>Size of word (window) to count</label>
-    </param>
-    <param name="frame" type="select">
-      <label>Frame to inspect</label>
-      <option value="0">All Frames</option>
-      <option value="1">Frame 1</option>
-      <option value="2">Frame 2</option>
-      <option value="3">Frame 3</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="compseq" name="out_file1" />
+<tool id="EMBOSS: compseq14" name="compseq" version="5.0.0.1">
+  <description>Count composition of dimer/trimer/etc words in a sequence</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <command>compseq -sequence '$input1' -outfile '$out_file1' -word $word -frame $frame -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="fasta" label="On query" />
+    <param name="word" type="integer" value="2" label="Size of word (window) to count" />
+    <param name="frame" type="select" label="Frame to inspect">
+      <option value="0">All Frames</option>
+      <option value="1">Frame 1</option>
+      <option value="2">Frame 2</option>
+      <option value="3">Frame 3</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="compseq" />
   </outputs>
   <tests>
     <test>
@@ -27,7 +25,7 @@
       <param name="frame" value="0"/>
       <output name="out_file1" file="emboss_compseq_out.compseq"/>
     </test>
-  </tests>
+  </tests>
   <help>
 .. class:: warningmark
 
@@ -36,15 +34,8 @@
 -----
 
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/compseq.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/compseq.html
   </help>
+  <expand macro="citations" />
 </tool>
--- a/emboss_cpgplot.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_cpgplot.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,41 +1,27 @@
-<tool id="EMBOSS: cpgplot15" name="cpgplot" version="5.0.0">
-  <description>Plot CpG rich areas</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command interpreter="perl">emboss_cpgplot_wrapper.pl cpgplot -sequence $input1 -window $window -minlen $minlen -minpc $minpc -outfile $outfile -graph png -goutfile $goutfile -outfeat $outfeat -minoe $minoe -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>On query</label>
-    </param>
-    <param name="window" type="integer" value="100">
-      <label>Window Size</label>
-    </param>
-    <param name="minlen" type="integer" value="200">
-      <label>Minimum length</label>
-    </param>
-    <param name="minoe" type="float" value="0.6">
-      <label>Minimum average observed to expected ratio</label>
-    </param>
-    <param name="minpc" type="float" value="50.0">
-      <label>Minimum average percentage of G plus C</label>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="cpgplot" name="outfile" />
-    <data format="png" name="goutfile" />
-    <data format="gff" name="outfeat" />
-  </outputs>
-  <code file="emboss_format_corrector.py" />
+<tool id="EMBOSS: cpgplot15" name="cpgplot" version="5.0.0">
+  <description>Plot CpG rich areas</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>perl '$__tool_directory__/emboss_cpgplot_wrapper.pl' cpgplot -sequence '$input1' -window $window -minlen $minlen -minpc $minpc -outfile '$outfile' -graph png -goutfile '$goutfile' -outfeat '$outfeat' -minoe $minoe -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="On query" />
+    <param name="window" type="integer" value="100" label="Window size" />
+    <param name="minlen" type="integer" value="200" label="Minimum length" />
+    <param name="minoe" type="float" value="0.6" label="Minimum average observed to expected ratio" />
+    <param name="minpc" type="float" value="50.0" label="Minimum average percentage of G plus C" />
+  </inputs>
+  <outputs>
+    <data name="outfile" format="cpgplot" />
+    <data name="goutfile" format="png" />
+    <data name="outfeat" format="gff" />
+  </outputs>
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/cpgplot.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/cpgplot.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_cpgreport.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_cpgreport.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,65 +1,57 @@
-<tool id="EMBOSS: cpgreport16" name="cpgreport" version="5.0.0">
-  <description>Reports all CpG rich regions</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command><![CDATA[
-    cpgreport 
-      -sequence '$input1' 
-      -outfile '$out_file1' 
-      -outfeat '$out_file2'
-      -offormat3 '$out_format2'
-      -score '$score'
-      -auto
-  ]]>
-  </command>
-  <inputs>
-    <param format="fasta" name="input1" type="data">
-      <label>On query</label>
-    </param>
-    <param name="score" type="text" value="17">
-      <label>Score for each CG sequence found (1-200)</label>
-    </param>
-    <param name="out_format2" type="select" label="Output Feature File Format">
-      <option value="gff">GFF</option>
-      <option value="embl">EMBL</option>
-      <option value="swiss">SwissProt</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="cpgreport" name="out_file1" />
-    <data format="gff" name="out_file2" />
-  </outputs>
-  <tests>
-    <test>
-      <param name="input1" value="2.fasta"/>
-      <param name="score" value="17"/>
-      <param name="out_format2" value="embl"/>
-      <output name="out_file1" file="emboss_cpgreport_out2.cpgreport"/>
-    </test>
-    <!-- <test>
-      <param name="input1" value="2.fasta"/>
-      <param name="score" value="17"/>
-      <param name="out_format2" value="gff"/>
-      <output name="out_file1" file="emboss_cpgreport_out1.gff"/>
-    </test>  -->
-  </tests>
-  <code file="emboss_format_corrector.py" />
-  <help>
-.. class:: warningmark
-
-The input dataset needs to be sequences.
-
------
-
-    You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/cpgreport.html
-
-------
-
-**Citation**
-
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
-  </help>
-</tool>
+<tool id="EMBOSS: cpgreport16" name="cpgreport" version="5.0.0.1">
+  <description>Reports all CpG rich regions</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command><![CDATA[
+    cpgreport
+      -sequence '$input1'
+      -outfile '$out_file1'
+      -outfeat '$out_file2'
+      -offormat3 $out_format2
+      -score $score
+      -auto
+  ]]>
+  </command>
+  <inputs>
+    <param name="input1" type="data" format="fasta" label="On query" />
+    <param name="score" type="integer" min="1" max="200" value="17" label="Score for each CG sequence found" />
+    <param name="out_format2" type="select" label="Output feature file format">
+      <option value="gff">GFF</option>
+      <option value="embl">EMBL</option>
+      <option value="swiss">SwissProt</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="cpgreport" />
+    <data name="out_file2" format="gff" />
+  </outputs>
+  <tests>
+    <test>
+      <param name="input1" value="2.fasta"/>
+      <param name="score" value="17"/>
+      <param name="out_format2" value="embl"/>
+      <output name="out_file1" file="emboss_cpgreport_out2.cpgreport"/>
+    </test>
+    <!-- <test>
+      <param name="input1" value="2.fasta"/>
+      <param name="score" value="17"/>
+      <param name="out_format2" value="gff"/>
+      <output name="out_file1" file="emboss_cpgreport_out1.gff"/>
+    </test>  -->
+  </tests>
+  <help>
+.. class:: warningmark
+
+The input dataset needs to be sequences.
+
+-----
+
+    You can view the original documentation here_.
+
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/cpgreport.html
+  </help>
+  <expand macro="citations" />
+</tool>
--- a/emboss_cusp.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_cusp.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,21 +1,22 @@
-<tool id="EMBOSS: cusp17" name="cusp" version="5.0.0">
-  <description>Create a codon usage table</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>cusp -sequence $input1 -outfile $out_file1 -auto</command>
-  <inputs>
-    <param format="fasta" name="input1" type="data">
-      <label>On query</label>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="cusp" name="out_file1" />
+<tool id="EMBOSS: cusp17" name="cusp" version="5.0.0">
+  <description>Create a codon usage table</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <command>cusp -sequence '$input1' -outfile '$out_file1' -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="fasta" label="On query" />
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="cusp" />
   </outputs>
   <tests>
     <test>
       <param name="input1" value="2.fasta"/>
       <output name="out_file1" file="emboss_cusp_out.cusp"/>
     </test>
-  </tests>
+  </tests>
   <help>
 .. class:: warningmark
 
@@ -24,15 +25,8 @@
 -----
 
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/cusp.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/cusp.html
   </help>
+  <expand macro="citations" />
 </tool>
--- a/emboss_cutseq.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_cutseq.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,52 +1,49 @@
-<tool id="EMBOSS: cutseq18" name="cutseq" version="5.0.0">
-  <description>Removes a specified section from a sequence</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>cutseq -sequence $input1 -outseq $out_file1 -from $from -to $to -osformat2 $out_format1 -auto</command>
-  <inputs>
-    <param format="fasta" name="input1" type="data">
-      <label>On query</label>
-    </param>
-    <param name="from" type="text" value="1">
-      <label>Start of region to delete</label>
-    </param>
-    <param name="to" type="text" value="1">
-      <label>End of region to delete</label>
-    </param>
-    <param name="out_format1" type="select">
-      <label>Output Sequence File Format</label>
-      <option value="fasta">FASTA (m)</option>
-      <option value="acedb">ACeDB (m)</option>
-      <option value="asn1">ASN.1 (m)</option>
-      <option value="clustal">Clustal (m)</option>
-      <option value="codata">CODATA (m)</option>
-      <option value="embl">EMBL (m)</option>
-      <option value="fitch">Fitch (m)</option>
-      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
-      <option value="genbank">GENBANK (m)</option>
-      <option value="gff">GFF (m)</option>
-      <option value="hennig86">Hennig86 (m)</option>
-      <option value="ig">Intelligenetics (m)</option>
-      <option value="jackknifer">Jackknifer (m)</option>
-      <option value="jackknifernon">Jackknifernon (m)</option>
-      <option value="mega">Mega (m)</option>
-      <option value="meganon">Meganon (m)</option>
-      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
-      <option value="pir">NBRF (PIR) (m)</option>
-      <option value="ncbi">NCBI style FASTA (m)</option>
-      <option value="nexus">Nexus/PAUP (m)</option>
-      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
-      <option value="phylip">PHYLIP interleaved (m)</option>
-      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
-      <option value="selex">SELEX (m)</option>
-      <option value="staden">Staden (s)</option>
-      <option value="strider">DNA strider (m)</option>
-      <option value="swiss">SwisProt entry (m)</option>
-      <option value="text">Plain sequence (s)</option>
-      <option value="treecon">Treecon (m)</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="fasta" name="out_file1" />
+<tool id="EMBOSS: cutseq18" name="cutseq" version="5.0.0.1">
+  <description>Removes a specified section from a sequence</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>cutseq -sequence '$input1' -outseq '$out_file1' -from $from -to $to -osformat2 $out_format1 -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="fasta" label="On query" />
+    <param name="from" type="integer" value="1" label="Start of region to delete" />
+    <param name="to" type="integer" value="1" label="End of region to delete" />
+    <param name="out_format1" type="select" label="Output sequence file format">
+      <option value="fasta">FASTA (m)</option>
+      <option value="acedb">ACeDB (m)</option>
+      <option value="asn1">ASN.1 (m)</option>
+      <option value="clustal">Clustal (m)</option>
+      <option value="codata">CODATA (m)</option>
+      <option value="embl">EMBL (m)</option>
+      <option value="fitch">Fitch (m)</option>
+      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
+      <option value="genbank">GENBANK (m)</option>
+      <option value="gff">GFF (m)</option>
+      <option value="hennig86">Hennig86 (m)</option>
+      <option value="ig">Intelligenetics (m)</option>
+      <option value="jackknifer">Jackknifer (m)</option>
+      <option value="jackknifernon">Jackknifernon (m)</option>
+      <option value="mega">Mega (m)</option>
+      <option value="meganon">Meganon (m)</option>
+      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
+      <option value="pir">NBRF (PIR) (m)</option>
+      <option value="ncbi">NCBI style FASTA (m)</option>
+      <option value="nexus">Nexus/PAUP (m)</option>
+      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
+      <option value="phylip">PHYLIP interleaved (m)</option>
+      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
+      <option value="selex">SELEX (m)</option>
+      <option value="staden">Staden (s)</option>
+      <option value="strider">DNA strider (m)</option>
+      <option value="swiss">SwisProt entry (m)</option>
+      <option value="text">Plain sequence (s)</option>
+      <option value="treecon">Treecon (m)</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="fasta" />
   </outputs>
   <tests>
     <test>
@@ -56,8 +53,7 @@
       <param name="out_format1" value="fasta"/>
       <output name="out_file1" file="emboss_cutseq_out.fasta"/>
     </test>
-  </tests>
-  <code file="emboss_format_corrector.py" />
+  </tests>
   <help>
 .. class:: warningmark
 
@@ -66,15 +62,8 @@
 -----
 
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/cutseq.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/cutseq.html
   </help>
+  <expand macro="citations" />
 </tool>
--- a/emboss_dan.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_dan.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,60 +1,42 @@
-<tool id="EMBOSS: dan19" name="dan" version="5.0.0">
-  <description>Calculates DNA RNA/DNA melting temperature</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command interpreter="perl">emboss_single_outputfile_wrapper.pl dan -sequence $input1 -windowsize $window -goutfile $out_file1 -graph png -plot $plot1 -shiftincrement $shift -dnaconc $dnaconc
-  -saltconc $saltconc -product $product -formamide $formamide -mismatch $mismatch -prodlen $prodlen -thermo $thermo -temperature $temperature -rna $rna -outfile $out_file1 -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>On query</label>
-    </param>
-    <param name="window" type="text" value="20">
-      <label>Window Size</label>
-    </param>
-    <param name="shift" type="text" value="1">
-      <label>Step size (shift increment)</label>
-    </param>
-    <param name="dnaconc" type="text" value="50.0">
-      <label>DNA Concentration (nM)</label>
-    </param>
-    <param name="saltconc" type="text" value="50.0">
-      <label>Salt concentration (mM)</label>
-    </param>
-    <param name="thermo" type="select">
-      <label>Output the DeltaG, DeltaH and DeltaS values</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="temperature" type="text" value="25 ">
-      <label>Temperature at which to calculate the DeltaG, DeltaH and DeltaS values</label>
-    </param>
-    <param name="rna" type="select">
-      <label>Sequence is RNA</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="product" type="select">
-      <label>Include percent formamide, percent of mismatches allowed and product length</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="formamide" type="text" value="0 ">
-      <label>Formamide concentration (nM)</label>
-    </param>
-    <param name="mismatch" type="text" value="0 ">
-      <label>Percent mismatch to be used in calculations</label>
-    </param>
-    <param name="prodlen" type="text" value="20">
-      <label>Product length to be used in calculations</label>
-    </param>
-    <param name="plot1" type="select">
-      <label>Create a graph</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="dan" name="out_file1" />
-  </outputs>
+<tool id="EMBOSS: dan19" name="dan" version="5.0.0.1">
+  <description>Calculates DNA RNA/DNA melting temperature</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>perl '$__tool_directory__/emboss_single_outputfile_wrapper.pl' dan -sequence '$input1' -windowsize $window -goutfile '$out_file1' -graph png -plot $plot1 -shiftincrement $shift -dnaconc $dnaconc
+  -saltconc $saltconc -product $product -formamide $formamide -mismatch $mismatch -prodlen $prodlen -thermo $thermo -temperature $temperature -rna $rna -outfile $out_file1 -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="On query" />
+    <param name="window" type="integer" value="20" label="Window size" />
+    <param name="shift" type="integer" value="1" label="Step size (shift increment)" />
+    <param name="dnaconc" type="float" value="50.0" label="DNA Concentration (nM)" />
+    <param name="saltconc" type="float" value="50.0" label="Salt concentration (mM)" />
+    <param name="thermo" type="select" label="Output the DeltaG, DeltaH and DeltaS values">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="temperature" type="float" value="25.0" label="Temperature at which to calculate the DeltaG, DeltaH and DeltaS values" />
+    <param name="rna" type="select" label="Sequence is RNA">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="product" type="select" label="Include percent formamide, percent of mismatches allowed and product length">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="formamide" type="float" value="0.0" label="Formamide concentration (nM)" />
+    <param name="mismatch" type="float" value="0.0" label="Percent mismatch to be used in calculations" />
+    <param name="prodlen" type="integer" value="20" label="Product length to be used in calculations" />
+    <param name="plot1" type="select" label="Create a graph">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="dan" />
+  </outputs>
   <!--
   <tests>
     <test>
@@ -73,20 +55,12 @@
       <param name="plot1" value="yes"/>
       <output name="out_file1" file="emboss_dan_out.png"/>
     </test>
-  </tests>
-  -->
-  <code file="emboss_format_corrector.py" />
+  </tests>
+  -->
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/dan.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/dan.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_degapseq.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_degapseq.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,46 +1,47 @@
-<tool id="EMBOSS: degapseq20" name="degapseq" version="5.0.0">
-  <description>Removes gap characters from sequences</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>degapseq -sequence $input1 -outseq $out_file1 -osformat2 $out_format1 -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>On query</label>
-    </param>
-    <param name="out_format1" type="select">
-      <label>Output Sequence File Format</label>
-      <option value="fasta">FASTA (m)</option>
-      <option value="acedb">ACeDB (m)</option>
-      <option value="asn1">ASN.1 (m)</option>
-      <option value="clustal">Clustal (m)</option>
-      <option value="codata">CODATA (m)</option>
-      <option value="embl">EMBL (m)</option>
-      <option value="fitch">Fitch (m)</option>
-      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
-      <option value="genbank">GENBANK (m)</option>
-      <option value="gff">GFF (m)</option>
-      <option value="hennig86">Hennig86 (m)</option>
-      <option value="ig">Intelligenetics (m)</option>
-      <option value="jackknifer">Jackknifer (m)</option>
-      <option value="jackknifernon">Jackknifernon (m)</option>
-      <option value="mega">Mega (m)</option>
-      <option value="meganon">Meganon (m)</option>
-      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
-      <option value="pir">NBRF (PIR) (m)</option>
-      <option value="ncbi">NCBI style FASTA (m)</option>
-      <option value="nexus">Nexus/PAUP (m)</option>
-      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
-      <option value="phylip">PHYLIP interleaved (m)</option>
-      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
-      <option value="selex">SELEX (m)</option>
-      <option value="staden">Staden (s)</option>
-      <option value="strider">DNA strider (m)</option>
-      <option value="swiss">SwisProt entry (m)</option>
-      <option value="text">Plain sequence (s)</option>
-      <option value="treecon">Treecon (m)</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="fasta" name="out_file1" />
+<tool id="EMBOSS: degapseq20" name="degapseq" version="5.0.0">
+  <description>Removes gap characters from sequences</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>degapseq -sequence '$input1' -outseq '$out_file1' -osformat2 $out_format1 -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="On query" />
+    <param name="out_format1" type="select" label="Output sequence file format">
+      <option value="fasta">FASTA (m)</option>
+      <option value="acedb">ACeDB (m)</option>
+      <option value="asn1">ASN.1 (m)</option>
+      <option value="clustal">Clustal (m)</option>
+      <option value="codata">CODATA (m)</option>
+      <option value="embl">EMBL (m)</option>
+      <option value="fitch">Fitch (m)</option>
+      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
+      <option value="genbank">GENBANK (m)</option>
+      <option value="gff">GFF (m)</option>
+      <option value="hennig86">Hennig86 (m)</option>
+      <option value="ig">Intelligenetics (m)</option>
+      <option value="jackknifer">Jackknifer (m)</option>
+      <option value="jackknifernon">Jackknifernon (m)</option>
+      <option value="mega">Mega (m)</option>
+      <option value="meganon">Meganon (m)</option>
+      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
+      <option value="pir">NBRF (PIR) (m)</option>
+      <option value="ncbi">NCBI style FASTA (m)</option>
+      <option value="nexus">Nexus/PAUP (m)</option>
+      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
+      <option value="phylip">PHYLIP interleaved (m)</option>
+      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
+      <option value="selex">SELEX (m)</option>
+      <option value="staden">Staden (s)</option>
+      <option value="strider">DNA strider (m)</option>
+      <option value="swiss">SwisProt entry (m)</option>
+      <option value="text">Plain sequence (s)</option>
+      <option value="treecon">Treecon (m)</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="fasta" />
   </outputs>
   <tests>
     <test>
@@ -48,19 +49,11 @@
       <param name="out_format1" value="fasta"/>
       <output name="out_file1" file="emboss_degapseq_out.fasta"/>
     </test>
-  </tests>
-  <code file="emboss_format_corrector.py" />
+  </tests>
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/degapseq.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/degapseq.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_descseq.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_descseq.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,57 +1,53 @@
-<tool id="EMBOSS: descseq21" name="descseq" version="5.0.0">
-  <description>Alter the name or description of a sequence</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>descseq -sequence $input1 -outseq $out_file1 -name "$seqname" -description "$desc" -append $append -osformat2 $out_format1 -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>On query</label>
-    </param>
-    <param name="seqname" type="text" value="">
-      <label>Name of the sequence</label>
-    </param>
-    <param name="desc" type="text" value="">
-      <label>Description of the sequence</label>
-    </param>
-    <param name="append" type="select">
-      <label>Append the name or description on to the end of the existing name or description</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="out_format1" type="select">
-      <label>Output Sequence File Format</label>
-      <option value="fasta">FASTA (m)</option>
-      <option value="acedb">ACeDB (m)</option>
-      <option value="asn1">ASN.1 (m)</option>
-      <option value="clustal">Clustal (m)</option>
-      <option value="codata">CODATA (m)</option>
-      <option value="embl">EMBL (m)</option>
-      <option value="fitch">Fitch (m)</option>
-      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
-      <option value="genbank">GENBANK (m)</option>
-      <option value="gff">GFF (m)</option>
-      <option value="hennig86">Hennig86 (m)</option>
-      <option value="ig">Intelligenetics (m)</option>
-      <option value="jackknifer">Jackknifer (m)</option>
-      <option value="jackknifernon">Jackknifernon (m)</option>
-      <option value="mega">Mega (m)</option>
-      <option value="meganon">Meganon (m)</option>
-      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
-      <option value="pir">NBRF (PIR) (m)</option>
-      <option value="ncbi">NCBI style FASTA (m)</option>
-      <option value="nexus">Nexus/PAUP (m)</option>
-      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
-      <option value="phylip">PHYLIP interleaved (m)</option>
-      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
-      <option value="selex">SELEX (m)</option>
-      <option value="staden">Staden (s)</option>
-      <option value="strider">DNA strider (m)</option>
-      <option value="swiss">SwisProt entry (m)</option>
-      <option value="text">Plain sequence (s)</option>
-      <option value="treecon">Treecon (m)</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="fasta" name="out_file1" />
+<tool id="EMBOSS: descseq21" name="descseq" version="5.0.0">
+  <description>Alter the name or description of a sequence</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>descseq -sequence '$input1' -outseq '$out_file1' -name '$seqname' -description '$desc' -append $append -osformat2 $out_format1 -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="On query" />
+    <param name="seqname" type="text" value="" label="Name of the sequence" />
+    <param name="desc" type="text" value="" label="Description of the sequence" />
+    <param name="append" type="select" label="Append the name or description on to the end of the existing name or description">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="out_format1" type="select" label="Output sequence file format">
+      <option value="fasta">FASTA (m)</option>
+      <option value="acedb">ACeDB (m)</option>
+      <option value="asn1">ASN.1 (m)</option>
+      <option value="clustal">Clustal (m)</option>
+      <option value="codata">CODATA (m)</option>
+      <option value="embl">EMBL (m)</option>
+      <option value="fitch">Fitch (m)</option>
+      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
+      <option value="genbank">GENBANK (m)</option>
+      <option value="gff">GFF (m)</option>
+      <option value="hennig86">Hennig86 (m)</option>
+      <option value="ig">Intelligenetics (m)</option>
+      <option value="jackknifer">Jackknifer (m)</option>
+      <option value="jackknifernon">Jackknifernon (m)</option>
+      <option value="mega">Mega (m)</option>
+      <option value="meganon">Meganon (m)</option>
+      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
+      <option value="pir">NBRF (PIR) (m)</option>
+      <option value="ncbi">NCBI style FASTA (m)</option>
+      <option value="nexus">Nexus/PAUP (m)</option>
+      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
+      <option value="phylip">PHYLIP interleaved (m)</option>
+      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
+      <option value="selex">SELEX (m)</option>
+      <option value="staden">Staden (s)</option>
+      <option value="strider">DNA strider (m)</option>
+      <option value="swiss">SwisProt entry (m)</option>
+      <option value="text">Plain sequence (s)</option>
+      <option value="treecon">Treecon (m)</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="fasta" />
   </outputs>
   <tests>
     <test>
@@ -62,19 +58,11 @@
       <param name="out_format1" value="fasta"/>
       <output name="out_file1" file="emboss_descseq_out.fasta"/>
     </test>
-  </tests>
-  <code file="emboss_format_corrector.py" />
+  </tests>
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/descseq.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/descseq.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_diffseq.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_diffseq.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,72 +1,58 @@
-<tool id="EMBOSS: diffseq22" name="diffseq" version="5.0.0">
-  <description>Find differences between nearly identical sequences</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>diffseq -asequence $input1 -bsequence $input2 -outfile $out_file1 -aoutfeat $out_file2 -boutfeat $out_file3 -wordsize $wordsize -globaldifferences $globaldifferences -rformat3
-  $out_format1 -offormat4 $out_format2 -offormat5 $out_format3 -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>Sequence 1</label>
-    </param>
-    <param format="data" name="input2" type="data">
-      <label>Sequence 2</label>
-    </param>
-    <param name="wordsize" type="text" value="20">
-      <label>Wordsize</label>
-    </param>
-    <param name="globaldifferences" type="select">
-      <label>Report differences at the ends</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="out_format1" type="select">
-      <label>Output Report File Format</label>
-      <option value="diffseq">Diffseq</option>
-      <option value="embl">EMBL</option>
-      <option value="genbank">GENBANK</option>
-      <option value="gff">GFF</option>
-      <option value="pir">PIR</option>
-      <option value="swiss">SwissProt</option>
-      <option value="dbmotif">DbMotif</option>
-      <option value="excel">Excel (tab delimited)</option>
-      <option value="feattable">FeatTable</option>
-      <option value="motif">Motif</option>
-      <option value="regions">Regions</option>
-      <option value="seqtable">SeqTable</option>
-      <option value="simple">SRS Simple</option>
-      <option value="srs">SRS</option>
-      <option value="table">Table</option>
-      <option value="tagseq">TagSeq</option>
-    </param>
-    <param name="out_format2" type="select">
-      <label>Sequence 1 Output Feature File Format</label>
-      <option value="gff">GFF</option>
-      <option value="embl">EMBL</option>
-      <option value="swiss">SwissProt</option>
-    </param>
-    <param name="out_format3" type="select">
-      <label>Sequence 2 Output Feature File Format</label>
-      <option value="gff">GFF</option>
-      <option value="embl">EMBL</option>
-      <option value="swiss">SwissProt</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="diffseq" name="out_file1" />
-    <data format="gff" name="out_file2" />
-    <data format="gff" name="out_file3" />
-  </outputs>
-  <code file="emboss_format_corrector.py" />
+<tool id="EMBOSS: diffseq22" name="diffseq" version="5.0.0.1">
+  <description>Find differences between nearly identical sequences</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>diffseq -asequence '$input1' -bsequence '$input2' -outfile '$out_file1' -aoutfeat '$out_file2' -boutfeat '$out_file3' -wordsize $wordsize -globaldifferences $globaldifferences -rformat3
+  $out_format1 -offormat4 $out_format2 -offormat5 $out_format3 -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="Sequence 1" />
+    <param name="input2" type="data" format="data" label="Sequence 2" />
+    <param name="wordsize" type="integer" value="20" label="Wordsize" />
+    <param name="globaldifferences" type="select" label="Report differences at the ends">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="out_format1" type="select" label="Output report file format">
+      <option value="diffseq">Diffseq</option>
+      <option value="embl">EMBL</option>
+      <option value="genbank">GENBANK</option>
+      <option value="gff">GFF</option>
+      <option value="pir">PIR</option>
+      <option value="swiss">SwissProt</option>
+      <option value="dbmotif">DbMotif</option>
+      <option value="excel">Excel (tab delimited)</option>
+      <option value="feattable">FeatTable</option>
+      <option value="motif">Motif</option>
+      <option value="regions">Regions</option>
+      <option value="seqtable">SeqTable</option>
+      <option value="simple">SRS Simple</option>
+      <option value="srs">SRS</option>
+      <option value="table">Table</option>
+      <option value="tagseq">TagSeq</option>
+    </param>
+    <param name="out_format2" type="select" label="Sequence 1 output feature file format">
+      <option value="gff">GFF</option>
+      <option value="embl">EMBL</option>
+      <option value="swiss">SwissProt</option>
+    </param>
+    <param name="out_format3" type="select" label="Sequence 2 output feature file format">
+      <option value="gff">GFF</option>
+      <option value="embl">EMBL</option>
+      <option value="swiss">SwissProt</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="diffseq" />
+    <data name="out_file2" format="gff" />
+    <data name="out_file3" format="gff" />
+  </outputs>
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/diffseq.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/diffseq.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_digest.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_digest.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,73 +1,61 @@
-<tool id="EMBOSS: digest23" name="digest" version="5.0.0">
-  <description>Protein proteolytic enzyme or reagent cleavage digest</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>digest -seqall $input1 -outfile $out_file1 -menu $menu -unfavoured $unfavoured -overlap $overlap -allpartials $allpartials -rformat2 $out_format1 -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>Sequence</label>
-    </param>
-    <param name="menu" type="select">
-      <label>Enzyme/Reagent</label>
-      <option value="1">Trypsin</option>
-      <option value="2">Lys-C</option>
-      <option value="3">Arg-C</option>
-      <option value="4">Asp-N</option>
-      <option value="5">V8-bicarb</option>
-      <option value="6">V8-phosph</option>
-      <option value="7">Chymotrypsin</option>
-      <option value="8">CNBr</option>
-    </param>
-    <param name="unfavoured" type="select">
-      <label>Trypsin will not normally cut after a K if it is followed by (e.g.) another K or a P. Specifying this shows those cuts, as well as the favoured ones.</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="overlap" type="select">
-      <label>Used for partial digestion. Shows all cuts from favoured cut sites plus 1..3, 2..4, 3..5 etc but not (e.g.) 2..5. Overlaps are therefore fragments with exactly one potential cut site
-      within it.</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="allpartials" type="select">
-      <label>As for overlap but fragments containing more than one potential cut site are included.</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="out_format1" type="select">
-      <label>Output Report File Format</label>
-      <option value="seqtable">SeqTable</option>
-      <option value="embl">EMBL</option>
-      <option value="genbank">GENBANK</option>
-      <option value="gff">GFF</option>
-      <option value="pir">PIR</option>
-      <option value="swiss">SwissProt</option>
-      <option value="dbmotif">DbMotif</option>
-      <option value="diffseq">Diffseq</option>
-      <option value="excel">Excel (tab delimited)</option>
-      <option value="feattable">FeatTable</option>
-      <option value="motif">Motif</option>
-      <option value="regions">Regions</option>
-      <option value="simple">SRS Simple</option>
-      <option value="srs">SRS</option>
-      <option value="table">Table</option>
-      <option value="tagseq">TagSeq</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="digest" name="out_file1" />
-  </outputs>
-  <code file="emboss_format_corrector.py" />
+<tool id="EMBOSS: digest23" name="digest" version="5.0.0">
+  <description>Protein proteolytic enzyme or reagent cleavage digest</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>digest -seqall '$input1' -outfile '$out_file1' -menu $menu -unfavoured $unfavoured -overlap $overlap -allpartials $allpartials -rformat2 $out_format1 -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="Sequence" />
+    <param name="menu" type="select" label="Enzyme/Reagent">
+      <option value="1">Trypsin</option>
+      <option value="2">Lys-C</option>
+      <option value="3">Arg-C</option>
+      <option value="4">Asp-N</option>
+      <option value="5">V8-bicarb</option>
+      <option value="6">V8-phosph</option>
+      <option value="7">Chymotrypsin</option>
+      <option value="8">CNBr</option>
+    </param>
+    <param name="unfavoured" type="select" label="Trypsin will not normally cut after a K if it is followed by (e.g.) another K or a P. Specifying this shows those cuts, as well as the favoured ones">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="overlap" type="select" label="Used for partial digestion. Shows all cuts from favoured cut sites plus 1..3, 2..4, 3..5 etc but not (e.g.) 2..5. Overlaps are therefore fragments with exactly one potential cut site within it">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="allpartials" type="select" label="As for overlap but fragments containing more than one potential cut site are included">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="out_format1" type="select" label="Output report file format">
+      <option value="seqtable">SeqTable</option>
+      <option value="embl">EMBL</option>
+      <option value="genbank">GENBANK</option>
+      <option value="gff">GFF</option>
+      <option value="pir">PIR</option>
+      <option value="swiss">SwissProt</option>
+      <option value="dbmotif">DbMotif</option>
+      <option value="diffseq">Diffseq</option>
+      <option value="excel">Excel (tab delimited)</option>
+      <option value="feattable">FeatTable</option>
+      <option value="motif">Motif</option>
+      <option value="regions">Regions</option>
+      <option value="simple">SRS Simple</option>
+      <option value="srs">SRS</option>
+      <option value="table">Table</option>
+      <option value="tagseq">TagSeq</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="digest" />
+  </outputs>
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/digest.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/digest.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_dotmatcher.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_dotmatcher.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,37 +1,24 @@
-<tool id="EMBOSS: dotmatcher24" name="dotmatcher" version="5.0.0">
-  <description>Displays a thresholded dotplot of two sequences</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command interpreter="perl">emboss_single_outputfile_wrapper.pl dotmatcher -asequence $input1 -bsequence $input2 -goutfile $out_file1 -windowsize $windowsize -threshold $threshold -graph png -xygraph png
-  -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>Sequence 1</label>
-    </param>
-    <param format="data" name="input2" type="data">
-      <label>Sequence 2</label>
-    </param>
-    <param name="windowsize" type="text" value="10">
-      <label>Window size</label>
-    </param>
-    <param name="threshold" type="text" value="23">
-      <label>Threshold</label>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="png" name="out_file1" />
+<tool id="EMBOSS: dotmatcher24" name="dotmatcher" version="5.0.0.1">
+  <description>Displays a thresholded dotplot of two sequences</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <command>perl '$__tool_directory__/emboss_single_outputfile_wrapper.pl' dotmatcher -asequence '$input1' -bsequence '$input2' -goutfile '$out_file1' -windowsize $windowsize -threshold $threshold -graph png -xygraph png -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="Sequence 1" />
+    <param name="input2" type="data" format="data" label="Sequence 2" />
+    <param name="windowsize" type="integer" value="10" label="Window size" />
+    <param name="threshold" type="integer" value="23" label="Threshold" />
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="png" />
   </outputs>
-  <!-- functional tests not possible since image output contains file name information and timestamp -->
+  <!-- functional tests not possible since image output contains file name information and timestamp -->
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/dotmatcher.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/dotmatcher.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_dotpath.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_dotpath.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,44 +1,31 @@
-<tool id="EMBOSS: dotpath25" name="dotpath" version="5.0.0">
-  <description>Non-overlapping wordmatch dotplot of two sequences</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command interpreter="perl">emboss_single_outputfile_wrapper.pl dotpath -asequence $input1 -bsequence $input2 -goutfile $out_file1 -wordsize $wordsize -overlaps $overlaps -boxit $boxit -graph png
-  -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>Sequence 1</label>
-    </param>
-    <param format="data" name="input2" type="data">
-      <label>Sequence 2</label>
-    </param>
-    <param name="wordsize" type="text" value="4">
-      <label>Word size (Integer 2 or more)</label>
-    </param>
-    <param name="overlaps" type="select">
-      <label>Display the overlapping matches (in red) as well as the minimal set of non-overlapping matches</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="boxit" type="select">
-      <label>Draw a box around dotplot</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="png" name="out_file1" />
+<tool id="EMBOSS: dotpath25" name="dotpath" version="5.0.0.1">
+  <description>Non-overlapping wordmatch dotplot of two sequences</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <command>perl '$__tool_directory__/emboss_single_outputfile_wrapper.pl' dotpath -asequence '$input1' -bsequence '$input2' -goutfile '$out_file1' -wordsize $wordsize -overlaps $overlaps -boxit $boxit -graph png -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="Sequence 1" />
+    <param name="input2" type="data" format="data" label="Sequence 2" />
+    <param name="wordsize" type="integer" min="2" value="4" label="Word size" />
+    <param name="overlaps" type="select" label="Display the overlapping matches (in red) as well as the minimal set of non-overlapping matches">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="boxit" type="select" label="Draw a box around dotplot">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="png" />
   </outputs>
-  <!-- functional tests not possible since image output contains file name information and timestamp -->
+  <!-- functional tests not possible since image output contains file name information and timestamp -->
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/dotpath.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/dotpath.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_dottup.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_dottup.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,38 +1,27 @@
-<tool id="EMBOSS: dottup26" name="dottup" version="5.0.0">
-  <description>Displays a wordmatch dotplot of two sequences</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command interpreter="perl">emboss_single_outputfile_wrapper.pl dottup -asequence $input1 -bsequence $input2 -goutfile $out_file1 -wordsize $wordsize -boxit $boxit -graph png  -xygraph png -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>Sequence 1</label>
-    </param>
-    <param format="data" name="input2" type="data">
-      <label>Sequence 2</label>
-    </param>
-    <param name="wordsize" type="text" value="4">
-      <label>Word size</label>
-    </param>
-    <param name="boxit" type="select">
-      <label>Draw a box around dotplot</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="png" name="out_file1" />
+<tool id="EMBOSS: dottup26" name="dottup" version="5.0.0.1">
+  <description>Displays a wordmatch dotplot of two sequences</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <command>perl '$__tool_directory__/emboss_single_outputfile_wrapper.pl' dottup -asequence '$input1' -bsequence '$input2' -goutfile '$out_file1' -wordsize $wordsize -boxit $boxit -graph png  -xygraph png -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="Sequence 1" />
+    <param name="input2" type="data" format="data" label="Sequence 2" />
+    <param name="wordsize" type="integer" value="4" label="Word size" />
+    <param name="boxit" type="select" label="Draw a box around dotplot">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="png" />
   </outputs>
-  <!-- functional tests not possible since image output contains file name information and timestamp -->
+  <!-- functional tests not possible since image output contains file name information and timestamp -->
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/dottup.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/dottup.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_dreg.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_dreg.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,30 +1,22 @@
-<tool id="EMBOSS: dreg27" name="dreg" version="5.0.0">
-  <description>Regular expression search of a nucleotide sequence</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>dreg -sequence $input1 -outfile $out_file1 -pattern "$pattern" -raccshow3 "no" -rusashow3 "no" -rdesshow3 "no" -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>Sequence 1</label>
-    </param>
-    <param name="pattern" type="text" value="(AUG)">
-      <label>Regular expression pattern</label>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="dreg" name="out_file1" />
+<tool id="EMBOSS: dreg27" name="dreg" version="5.0.0">
+  <description>Regular expression search of a nucleotide sequence</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <command>dreg -sequence '$input1' -outfile '$out_file1' -pattern '$pattern' -raccshow3 "no" -rusashow3 "no" -rdesshow3 "no" -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="Sequence 1" />
+    <param name="pattern" type="text" value="(AUG)" label="Regular expression pattern" />
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="dreg" />
   </outputs>
-  <!-- tests not possible since dreg timestamps output file -->  
+  <!-- tests not possible since dreg timestamps output file -->
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/dreg.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/dreg.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_einverted.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_einverted.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,29 +1,20 @@
-<tool id="EMBOSS: einverted28" name="einverted" version="5.0.0">
-  <description>Finds DNA inverted repeats</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>einverted -sequence $input1 -outfile $out_file1 -gap $gap -threshold $threshold -match $match -mismatch $mismatch -maxrepeat $maxrepeat -auto</command>
-  <inputs>
-    <param format="fasta" name="input1" type="data">
-      <label>On query</label>
-    </param>
-    <param name="gap" type="text" value="12">
-      <label>Gap penalty</label>
-    </param>
-    <param name="threshold" type="text" value="50">
-      <label>Minimum score threshold</label>
-    </param>
-    <param name="match" type="text" value="3">
-      <label>Match score</label>
-    </param>
-    <param name="mismatch" type="text" value="-4">
-      <label>Mismatch score</label>
-    </param>
-    <param name="maxrepeat" type="text" value="2000">
-      <label>Maximum separation between the start of repeat and the end of the inverted repeat</label>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="einverted" name="out_file1" />
+<tool id="EMBOSS: einverted28" name="einverted" version="5.0.0.1">
+  <description>Finds DNA inverted repeats</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <command>einverted -sequence '$input1' -outfile '$out_file1' -gap $gap -threshold $threshold -match $match -mismatch $mismatch -maxrepeat $maxrepeat -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="fasta" label="On query" />
+    <param name="gap" type="integer" value="12" label="Gap penalty" />
+    <param name="threshold" type="integer" value="50" label="Minimum score threshold" />
+    <param name="match" type="integer" value="3" label="Match score" />
+    <param name="mismatch" type="integer" value="-4" label="Mismatch score" />
+    <param name="maxrepeat" type="integer" value="2000" label="Maximum separation between the start of repeat and the end of the inverted repeat" />
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="einverted" />
   </outputs>
   <tests>
     <test>
@@ -35,7 +26,7 @@
       <param name="maxrepeat" value="2000"/>
       <output name="out_file1" file="emboss_einverted_out.einverted"/>
     </test>
-  </tests>
+  </tests>
   <help>
 .. class:: warningmark
 
@@ -44,15 +35,8 @@
 -----
 
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/einverted.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/einverted.html
   </help>
+  <expand macro="citations" />
 </tool>
--- a/emboss_epestfind.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_epestfind.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,48 +1,40 @@
-<tool id="EMBOSS: epestfind29" name="epestfind" version="5.0.0">
-  <description>Finds PEST motifs as potential proteolytic cleavage sites</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command interpreter="perl">emboss_single_outputfile_wrapper.pl epestfind -sequence $input1 -goutfile $ofile2 -outfile $ofile1 -window $window -order $order -potential $potential -poor $poor
-  -invalid $invalid -map $map -graph png -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>Sequence</label>
-    </param>
-    <param name="window" type="text" value="10">
-      <label>Minimal distance between positively charged amino acids</label>
-    </param>
-    <param name="order" type="select">
-      <label>Sort by</label>
-      <option value="3">Score</option>
-      <option value="1">Length</option>
-      <option value="2">Position</option>
-    </param>
-    <param name="threshold" type="text" value="5.0">
-      <label>Threshold value to discriminate weak from potential PEST motifs.</label>
-    </param>
-    <param name="potential" type="select">
-      <label>Decide whether potential PEST motifs should be printed</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="poor" type="select">
-      <label>Decide whether poor PEST motifs should be printed</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="invalid" type="select">
-      <label>Decide whether invalid PEST motifs should be printed</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="map" type="select">
-      <label>Decide whether PEST motifs should be mapped to sequence</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="png" name="ofile2" />
-    <data format="epestfind" name="ofile1" />
+<tool id="EMBOSS: epestfind29" name="epestfind" version="5.0.0.1">
+  <description>Finds PEST motifs as potential proteolytic cleavage sites</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <command>perl '$__tool_directory__/emboss_single_outputfile_wrapper.pl' epestfind -sequence '$input1' -goutfile '$ofile2' -outfile '$ofile1' -window $window -order $order -potential $potential -poor $poor
+  -invalid $invalid -map $map -graph png -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="Sequence" />
+    <param name="window" type="integer" value="10" label="Minimal distance between positively charged amino acids" />
+    <param name="order" type="select" label="Sort by">
+      <option value="3">Score</option>
+      <option value="1">Length</option>
+      <option value="2">Position</option>
+    </param>
+    <param name="threshold" type="float" value="5.0" label="Threshold value to discriminate weak from potential PEST motifs" />
+    <param name="potential" type="select" label="Decide whether potential PEST motifs should be printed">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="poor" type="select" label="Decide whether poor PEST motifs should be printed">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="invalid" type="select" label="Decide whether invalid PEST motifs should be printed">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="map" type="select" label="Decide whether PEST motifs should be mapped to sequence">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="ofile2" format="png" />
+    <data name="ofile1" format="epestfind" />
   </outputs>
 <!--    <tests>
     <test>
@@ -56,18 +48,11 @@
       <param name="map" value="yes"/>
       <output name="ofile1" file="emboss_epestfind_out.epestfind"/>
     </test>
-  </tests>  output file contains file location info  -->
+  </tests>  output file contains file location info  -->
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/epestfind.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/epestfind.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_equicktandem.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_equicktandem.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,40 +1,37 @@
-<tool id="EMBOSS: equicktandem31" name="equicktandem" version="5.0.0">
-  <description>Finds tandem repeats</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>equicktandem -sequence $input1 -outfile $out_file1 -origfile $ofile2 -maxrepeat $maxrepeat -threshold $threshold -rformat2 $out_format1 -auto</command>
-  <inputs>
-    <param format="fasta" name="input1" type="data">
-      <label>Sequence</label>
-    </param>
-    <param name="maxrepeat" type="text" value="600">
-      <label>Maximum repeat size</label>
-    </param>
-    <param name="threshold" type="text" value="20">
-      <label>Threshold score</label>
-    </param>
-    <param name="out_format1" type="select">
-      <label>Output Report File Format</label>
-      <option value="table">Table</option>
-      <option value="embl">EMBL</option>
-      <option value="genbank">GENBANK</option>
-      <option value="gff">GFF</option>
-      <option value="pir">PIR</option>
-      <option value="swiss">SwissProt</option>
-      <option value="dbmotif">DbMotif</option>
-      <option value="diffseq">Diffseq</option>
-      <option value="excel">Excel (tab delimited)</option>
-      <option value="feattable">FeatTable</option>
-      <option value="motif">Motif</option>
-      <option value="regions">Regions</option>
-      <option value="seqtable">SeqTable</option>
-      <option value="simple">SRS Simple</option>
-      <option value="srs">SRS</option>
-      <option value="tagseq">TagSeq</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="table" name="out_file1" />
-    <data format="equicktandem" name="ofile2" />
+<tool id="EMBOSS: equicktandem31" name="equicktandem" version="5.0.0.1">
+  <description>Finds tandem repeats</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>equicktandem -sequence '$input1' -outfile '$out_file1' -origfile '$ofile2' -maxrepeat $maxrepeat -threshold $threshold -rformat2 $out_format1 -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="fasta" label="Sequence" />
+    <param name="maxrepeat" type="integer" value="600" label="Maximum repeat size" />
+    <param name="threshold" type="integer" value="20" label="Threshold score" />
+    <param name="out_format1" type="select" label="Output report file format">
+      <option value="table">Table</option>
+      <option value="embl">EMBL</option>
+      <option value="genbank">GENBANK</option>
+      <option value="gff">GFF</option>
+      <option value="pir">PIR</option>
+      <option value="swiss">SwissProt</option>
+      <option value="dbmotif">DbMotif</option>
+      <option value="diffseq">Diffseq</option>
+      <option value="excel">Excel (tab delimited)</option>
+      <option value="feattable">FeatTable</option>
+      <option value="motif">Motif</option>
+      <option value="regions">Regions</option>
+      <option value="seqtable">SeqTable</option>
+      <option value="simple">SRS Simple</option>
+      <option value="srs">SRS</option>
+      <option value="tagseq">TagSeq</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="table" />
+    <data name="ofile2" format="equicktandem" />
   </outputs>
     <tests>
     <test>
@@ -44,8 +41,7 @@
       <param name="out_format1" value="table"/>
       <output name="ofile2" file="emboss_equicktandem_out.equicktandem"/>
     </test>
-  </tests>
-  <code file="emboss_format_corrector.py" />
+  </tests>
   <help>
 .. class:: warningmark
 
@@ -54,15 +50,8 @@
 -----
 
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/equicktandem.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/equicktandem.html
   </help>
+  <expand macro="citations" />
 </tool>
--- a/emboss_est2genome.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_est2genome.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,71 +1,47 @@
-<tool id="EMBOSS: est2genome32" name="est2genome" version="5.0.0">
-  <description>Align EST and genomic DNA sequences</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>est2genome -estsequence $input1 -genomesequence $input2 -outfile $out_file1 -match $match -mismatch $mismatch -gappenalty $gappenalty -intronpenalty $intronpenalty -splicepenalty
-  $splicepenalty -minscore $minscore -reverse $reverse -splice $splice -mode $mode -best $best -shuffle $shuffle -seed $seed -align $align -width $width -auto</command>
-  <inputs>
-    <param format="fasta" name="input1" type="data">
-      <label>EST sequence(s)</label>
-    </param>
-    <param format="data" name="input2" type="data">
-      <label>Genomic sequence</label>
-    </param>
-    <param name="match" type="text" value="1">
-      <label>Score for matching two bases</label>
-    </param>
-    <param name="mismatch" type="text" value="1">
-      <label>Cost for mismatching two bases</label>
-    </param>
-    <param name="gappenalty" type="text" value="2">
-      <label>Cost for deleting a single base in either sequence, excluding introns</label>
-    </param>
-    <param name="intronpenalty" type="text" value="40">
-      <label>Cost for an intron, independent of length</label>
-    </param>
-    <param name="splicepenalty" type="text" value="20">
-      <label>Cost for an intron, independent of length and starting/ending on donor-acceptor sites</label>
-    </param>
-    <param name="minscore" type="text" value="30">
-      <label>Exclude alignments with scores below this threshold score</label>
-    </param>
-    <param name="reverse" type="select">
-      <label>Reverse the orientation of the EST sequence</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="splice" type="select">
-      <label>Use donor and acceptor splice sites</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="mode" type="select">
-      <label>Comparison mode</label>
-      <option value="both">Both strands</option>
-      <option value="forward">Forward strand only</option>
-      <option value="reverse">Reverse strand only</option>
-    </param>
-    <param name="best" type="select">
-      <label>Only best comparisons</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="shuffle" type="text" value="0">
-      <label>Shuffle</label>
-    </param>
-    <param name="seed" type="text" value="20825">
-      <label>Random number seed</label>
-    </param>
-    <param name="align" type="select">
-      <label>Show the alignment</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="width" type="text" value="50">
-      <label>Alignment width</label>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="est2genome" name="out_file1" />
+<tool id="EMBOSS: est2genome32" name="est2genome" version="5.0.0.1">
+  <description>Align EST and genomic DNA sequences</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <command>est2genome -estsequence '$input1' -genomesequence '$input2' -outfile '$out_file1' -match $match -mismatch $mismatch -gappenalty $gappenalty -intronpenalty $intronpenalty -splicepenalty
+  $splicepenalty -minscore $minscore -reverse $reverse -splice $splice -mode $mode -best $best -shuffle $shuffle -seed $seed -align $align -width $width -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="fasta" label="EST sequence(s)" />
+    <param name="input2" type="data" format="data" label="Genomic sequence" />
+    <param name="match" type="integer" value="1" label="Score for matching two bases" />
+    <param name="mismatch" type="integer" value="1" label="Cost for mismatching two bases" />
+    <param name="gappenalty" type="integer" value="2" label="Cost for deleting a single base in either sequence, excluding introns" />
+    <param name="intronpenalty" type="integer" value="40" label="Cost for an intron, independent of length" />
+    <param name="splicepenalty" type="integer" value="20" label="Cost for an intron, independent of length and starting/ending on donor-acceptor sites" />
+    <param name="minscore" type="integer" value="30" label="Exclude alignments with scores below this threshold score" />
+    <param name="reverse" type="select" label="Reverse the orientation of the EST sequence">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="splice" type="select" label="Use donor and acceptor splice sites">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="mode" type="select" label="Comparison mode">
+      <option value="both">Both strands</option>
+      <option value="forward">Forward strand only</option>
+      <option value="reverse">Reverse strand only</option>
+    </param>
+    <param name="best" type="select" label="Only best comparisons">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="shuffle" type="integer" value="0" label="Shuffle" />
+    <param name="seed" type="integer" value="20825" label="Random number seed" />
+    <param name="align" type="select" label="Show the alignment">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="width" type="integer" value="50" label="Alignment width" />
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="est2genome" />
   </outputs>
   <tests>
     <test>
@@ -88,7 +64,7 @@
       <param name="width" value="50"/>
       <output name="out_file1" file="emboss_est2genome_out.est2genome"/>
     </test>
-  </tests>
+  </tests>
   <help>
 .. class:: warningmark
 
@@ -97,15 +73,8 @@
 -----
 
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/est2genome.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/est2genome.html
   </help>
+  <expand macro="citations" />
 </tool>
--- a/emboss_etandem.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_etandem.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,53 +1,46 @@
-<tool id="EMBOSS: etandem33" name="etandem" version="5.0.0">
-  <description>Looks for tandem repeats in a nucleotide sequence</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>etandem -sequence $input1 -outfile $out_file1 -origfile $ofile2 -minrepeat $minrepeat -maxrepeat $maxrepeat -threshold $threshold -mismatch $mismatch -uniform $uniform -rformat2 $out_format1 -auto</command>
-  <inputs>
-    <param format="fasta" name="input1" type="data">
-      <label>Sequence</label>
-    </param>
-    <param name="minrepeat" type="text" value="10">
-      <label>Minimum repeat size</label>
-    </param>
-    <param name="maxrepeat" type="text" value="10">
-      <label>Maximum repeat size</label>
-    </param>
-    <param name="threshold" type="text" value="20">
-      <label>Threshold score</label>
-    </param>
-    <param name="mismatch" type="select">
-      <label>Allow N as a mismatch</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="uniform" type="select">
-      <label>Allow uniform consensus</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="out_format1" type="select">
-      <label>Output Report File Format</label>
-      <option value="table">Table</option>
-      <option value="embl">EMBL</option>
-      <option value="genbank">GENBANK</option>
-      <option value="gff">GFF</option>
-      <option value="pir">PIR</option>
-      <option value="swiss">SwissProt</option>
-      <option value="dbmotif">DbMotif</option>
-      <option value="diffseq">Diffseq</option>
-      <option value="excel">Excel (tab delimited)</option>
-      <option value="feattable">FeatTable</option>
-      <option value="motif">Motif</option>
-      <option value="regions">Regions</option>
-      <option value="seqtable">SeqTable</option>
-      <option value="simple">SRS Simple</option>
-      <option value="srs">SRS</option>
-      <option value="tagseq">TagSeq</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="etandem" name="out_file1" />
-    <data format="table" name="ofile2" />    
+<tool id="EMBOSS: etandem33" name="etandem" version="5.0.0.1">
+  <description>Looks for tandem repeats in a nucleotide sequence</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>etandem -sequence '$input1' -outfile '$out_file1' -origfile '$ofile2' -minrepeat $minrepeat -maxrepeat $maxrepeat -threshold $threshold -mismatch $mismatch -uniform $uniform -rformat2 $out_format1 -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="fasta" label="Sequence" />
+    <param name="minrepeat" type="integer" value="10" label="Minimum repeat size" />
+    <param name="maxrepeat" type="integer" value="10" label="Maximum repeat size" />
+    <param name="threshold" type="integer" value="20" label="Threshold score" />
+    <param name="mismatch" type="select" label="Allow N as a mismatch">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="uniform" type="select" label="Allow uniform consensus">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="out_format1" type="select" label="Output report file format">
+      <option value="table">Table</option>
+      <option value="embl">EMBL</option>
+      <option value="genbank">GENBANK</option>
+      <option value="gff">GFF</option>
+      <option value="pir">PIR</option>
+      <option value="swiss">SwissProt</option>
+      <option value="dbmotif">DbMotif</option>
+      <option value="diffseq">Diffseq</option>
+      <option value="excel">Excel (tab delimited)</option>
+      <option value="feattable">FeatTable</option>
+      <option value="motif">Motif</option>
+      <option value="regions">Regions</option>
+      <option value="seqtable">SeqTable</option>
+      <option value="simple">SRS Simple</option>
+      <option value="srs">SRS</option>
+      <option value="tagseq">TagSeq</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="etandem" />
+    <data name="ofile2" format="table" />
   </outputs>
     <tests>
     <test>
@@ -60,8 +53,7 @@
       <param name="out_format1" value="table"/>
       <output name="ofile2" file="emboss_etandem_out.table"/>
     </test>
-  </tests>
-  <code file="emboss_format_corrector.py" />
+  </tests>
   <help>
 .. class:: warningmark
 
@@ -70,17 +62,8 @@
 -----
 
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/etandem.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/etandem.html
   </help>
+  <expand macro="citations" />
 </tool>
-
-
--- a/emboss_extractfeat.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_extractfeat.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,58 +1,38 @@
-<tool id="EMBOSS: extractfeat34" name="extractfeat" version="5.0.0">
-  <!-- tool tested with documentation, functional test not designed due to empty files resulting from test input sequences -->  
-  <description>Extract features from a sequence</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>extractfeat -sequence $input1 -outseq $out_file1 -before $before -after $after -source "$source" -type "$type" -sense $sense -minscore $minscore -maxscore $maxscore -tag "$tag" -value
-  "$value" -join $join -featinname $featinname -describe "$describe" -osformat2 $out_format1 -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>Sequences</label>
-    </param>
-    <param name="before" type="text" value="0">
-      <label>Number of bases or residues before the feature to include in the extracted sequence</label>
-    </param>
-    <param name="after" type="text" value="0">
-      <label>Number of bases or residues after the feature to include in the extracted sequence</label>
-    </param>
-    <param name="source" type="text" value="*">
-      <label>Feature source</label>
-    </param>
-    <param name="type" type="text" value="*">
-      <label>Feature type</label>
-    </param>
-    <param name="sense" type="select">
-      <label>Feature sense</label>
-      <option value="0">Any sense</option>
-      <option value="1">Forward sense</option>
-      <option value="-1">Reverse sense</option>
-    </param>
-    <param name="minscore" type="text" value="0.0">
-      <label>Minimum score</label>
-    </param>
-    <param name="maxscore" type="text" value="0.0">
-      <label>Maximum score</label>
-    </param>
-    <param name="tag" type="text" value="*">
-      <label>Feature tags</label>
-    </param>
-    <param name="value" type="text" value="*">
-      <label>Tag values</label>
-    </param>
-    <param name="join" type="select">
-      <label>Join features</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="featinname" type="select">
-      <label>Put feature type in sequence name</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="describe" type="text" value="">
-      <label>Specify one or more tag names that should be added to the output sequence Description text</label>
-    </param>
-    <param name="out_format1" type="select">
-      <label>Output Sequence File Format</label>
+<tool id="EMBOSS: extractfeat34" name="extractfeat" version="5.0.0.1">
+  <!-- tool tested with documentation, functional test not designed due to empty files resulting from test input sequences -->
+  <description>Extract features from a sequence</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>extractfeat -sequence '$input1' -outseq '$out_file1' -before $before -after $after -source '$source' -type '$type' -sense $sense -minscore $minscore -maxscore $maxscore -tag '$tag' -value
+  '$value' -join $join -featinname $featinname -describe '$describe' -osformat2 $out_format1 -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="Sequences" />
+    <param name="before" type="integer" value="0" label="Number of bases or residues before the feature to include in the extracted sequence" />
+    <param name="after" type="integer" value="0" label="Number of bases or residues after the feature to include in the extracted sequence" />
+    <param name="source" type="text" value="*" label="Feature source" />
+    <param name="type" type="text" value="*" label="Feature type" />
+    <param name="sense" type="select" label="Feature sense">
+      <option value="0">Any sense</option>
+      <option value="1">Forward sense</option>
+      <option value="-1">Reverse sense</option>
+    </param>
+    <param name="minscore" type="float" value="0.0" label="Minimum score" />
+    <param name="maxscore" type="float" value="0.0" label="Maximum score" />
+    <param name="tag" type="text" value="*" label="Feature tags" />
+    <param name="value" type="text" value="*" label="Tag values" />
+    <param name="join" type="select" label="Join features">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="featinname" type="select" label="Put feature type in sequence name">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="describe" type="text" value="" label="Specify one or more tag names that should be added to the output sequence Description text" />
+    <param name="out_format1" type="select" label="Output sequence file format">
       <option value="fasta">FASTA (m)</option>
       <option value="acedb">ACeDB (m)</option>
       <option value="asn1">ASN.1 (m)</option>
@@ -81,24 +61,16 @@
       <option value="strider">DNA strider (m)</option>
       <option value="swiss">SwisProt entry (m)</option>
       <option value="text">Plain sequence (s)</option>
-      <option value="treecon">Treecon (m)</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="fasta" name="out_file1" />
-  </outputs>
-  <code file="emboss_format_corrector.py" />
+      <option value="treecon">Treecon (m)</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="fasta" />
+  </outputs>
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/extractfeat.html
 
-------
-
-**Citation**
-
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/extractfeat.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_extractseq.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_extractseq.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,54 +1,52 @@
-<tool id="EMBOSS: extractseq35" name="extractseq" version="5.0.0">
-  <description>Extract regions from a sequence</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>extractseq -sequence $input1 -outseq $out_file1 -regions $regions -separate $separate -osformat2 $out_format1 -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>Sequences</label>
-    </param>
-    <param name="regions" type="text" value="1-9999999">
-      <label>Regions to extract</label>
-    </param>
-    <param name="separate" type="select">
-      <label>Write each specified region as a separate sequence</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="out_format1" type="select">
-      <label>Output Sequence File Format</label>
-      <option value="fasta">FASTA (m)</option>
-      <option value="acedb">ACeDB (m)</option>
-      <option value="asn1">ASN.1 (m)</option>
-      <option value="clustal">Clustal (m)</option>
-      <option value="codata">CODATA (m)</option>
-      <option value="embl">EMBL (m)</option>
-      <option value="fitch">Fitch (m)</option>
-      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
-      <option value="genbank">GENBANK (m)</option>
-      <option value="gff">GFF (m)</option>
-      <option value="hennig86">Hennig86 (m)</option>
-      <option value="ig">Intelligenetics (m)</option>
-      <option value="jackknifer">Jackknifer (m)</option>
-      <option value="jackknifernon">Jackknifernon (m)</option>
-      <option value="mega">Mega (m)</option>
-      <option value="meganon">Meganon (m)</option>
-      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
-      <option value="pir">NBRF (PIR) (m)</option>
-      <option value="ncbi">NCBI style FASTA (m)</option>
-      <option value="nexus">Nexus/PAUP (m)</option>
-      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
-      <option value="phylip">PHYLIP interleaved (m)</option>
-      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
-      <option value="selex">SELEX (m)</option>
-      <option value="staden">Staden (s)</option>
-      <option value="strider">DNA strider (m)</option>
-      <option value="swiss">SwisProt entry (m)</option>
-      <option value="text">Plain sequence (s)</option>
-      <option value="treecon">Treecon (m)</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="fasta" name="out_file1" />
+<tool id="EMBOSS: extractseq35" name="extractseq" version="5.0.0">
+  <description>Extract regions from a sequence</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>extractseq -sequence '$input1' -outseq '$out_file1' -regions '$regions' -separate $separate -osformat2 $out_format1 -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="Sequences" />
+    <param name="regions" type="text" value="1-9999999" label="Regions to extract" />
+    <param name="separate" type="select" label="Write each specified region as a separate sequence">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="out_format1" type="select" label="Output sequence file format">
+      <option value="fasta">FASTA (m)</option>
+      <option value="acedb">ACeDB (m)</option>
+      <option value="asn1">ASN.1 (m)</option>
+      <option value="clustal">Clustal (m)</option>
+      <option value="codata">CODATA (m)</option>
+      <option value="embl">EMBL (m)</option>
+      <option value="fitch">Fitch (m)</option>
+      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
+      <option value="genbank">GENBANK (m)</option>
+      <option value="gff">GFF (m)</option>
+      <option value="hennig86">Hennig86 (m)</option>
+      <option value="ig">Intelligenetics (m)</option>
+      <option value="jackknifer">Jackknifer (m)</option>
+      <option value="jackknifernon">Jackknifernon (m)</option>
+      <option value="mega">Mega (m)</option>
+      <option value="meganon">Meganon (m)</option>
+      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
+      <option value="pir">NBRF (PIR) (m)</option>
+      <option value="ncbi">NCBI style FASTA (m)</option>
+      <option value="nexus">Nexus/PAUP (m)</option>
+      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
+      <option value="phylip">PHYLIP interleaved (m)</option>
+      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
+      <option value="selex">SELEX (m)</option>
+      <option value="staden">Staden (s)</option>
+      <option value="strider">DNA strider (m)</option>
+      <option value="swiss">SwisProt entry (m)</option>
+      <option value="text">Plain sequence (s)</option>
+      <option value="treecon">Treecon (m)</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="fasta" />
   </outputs>
   <tests>
     <test>
@@ -58,19 +56,11 @@
       <param name="out_format1" value="fasta"/>
       <output name="out_file1" file="emboss_extractseq_out.fasta"/>
     </test>
-  </tests>
-  <code file="emboss_format_corrector.py" />
+  </tests>
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/extractseq.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/extractseq.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_format_corrector.py	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_format_corrector.py	Mon Jan 30 13:27:40 2017 -0500
@@ -1,21 +1,18 @@
-#EMBOSS format corrector
-
+# EMBOSS format corrector
 import operator
 
-#Properly set file formats before job run
+
+# Properly set file formats before job run
 def exec_before_job( app, inp_data=None, out_data=None, tool=None, param_dict=None ):
-    #why isn't items an ordered list?
+    # why isn't items an ordered list?
     items = out_data.items()
-    #lets sort it ourselves....
     items = sorted(items, key=operator.itemgetter(0))
-    #items is now sorted...
-    
-    #normal filetype correction
-    data_count=1
+
+    # normal filetype correction
+    data_count = 1
     for name, data in items:
-        outputType = param_dict.get( 'out_format'+str(data_count), None )
-        #print "data_count",data_count, "name", name, "outputType", outputType
-        if outputType !=None:
+        outputType = param_dict.get( 'out_format' + str(data_count), None )
+        if outputType is not None:
             if outputType == 'ncbi':
                 outputType = "fasta"
             elif outputType == 'excel':
@@ -25,26 +22,26 @@
             data = app.datatypes_registry.change_datatype(data, outputType)
             app.model.context.add( data )
             app.model.context.flush()
-        data_count+=1
-    
-    #html filetype correction
-    data_count=1
+        data_count += 1
+
+    # html filetype correction
+    data_count = 1
     for name, data in items:
-        wants_plot = param_dict.get( 'html_out'+str(data_count), None )
+        wants_plot = param_dict.get( 'html_out' + str(data_count), None )
         ext = "html"
         if wants_plot == "yes":
             data = app.datatypes_registry.change_datatype(data, ext)
             app.model.context.add( data )
             app.model.context.flush()
-        data_count+=1
-    
-    #png file correction
-    data_count=1
+        data_count += 1
+
+    # png file correction
+    data_count = 1
     for name, data in items:
-        wants_plot = param_dict.get( 'plot'+str(data_count), None )
+        wants_plot = param_dict.get( 'plot' + str(data_count), None )
         ext = "png"
         if wants_plot == "yes":
             data = app.datatypes_registry.change_datatype(data, ext)
             app.model.context.add( data )
             app.model.context.flush()
-        data_count+=1
+        data_count += 1
--- a/emboss_freak.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_freak.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,23 +1,18 @@
-<tool id="EMBOSS: freak36" name="freak" version="5.0.0">
-  <description>Residue/base frequency table or plot</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>freak -seqall $input1 -outfile $out_file1 -window $window -letters $letters -graph png -step $step -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>Sequences</label>
-    </param>
-    <param name="letters" type="text" value="gc">
-      <label>Residue letters</label>
-    </param>
-    <param name="step" type="text" value="1">
-      <label>Stepping value</label>
-    </param>
-    <param name="window" type="text" value="30">
-      <label>Averaging window</label>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="freak" name="out_file1" />
+<tool id="EMBOSS: freak36" name="freak" version="5.0.0.1">
+  <description>Residue/base frequency table or plot</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <command>freak -seqall '$input1' -outfile '$out_file1' -window $window -letters '$letters' -graph png -step $step -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="Sequences" />
+    <param name="letters" type="text" value="gc" label="Residue letters" />
+    <param name="step" type="integer" value="1" label="Stepping value" />
+    <param name="window" type="integer" value="30" label="Averaging window" />
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="freak" />
   </outputs>
   <tests>
     <test>
@@ -27,18 +22,11 @@
       <param name="window" value="30"/>
       <output name="out_file1" file="emboss_freak_out.freak"/>
     </test>
-  </tests>
+  </tests>
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/freak.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/freak.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_fuzznuc.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_fuzznuc.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,53 +1,50 @@
-<tool id="EMBOSS: fuzznuc37" name="fuzznuc" version="5.0.1">
-  <description>Nucleic acid pattern search</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>fuzznuc -sequence $input1 -outfile $out_file1 -pattern '$pattern' -pmismatch $mismatch -complement $complement -rformat2 $out_format1 -auto</command>
-  <inputs>
-    <param format="fasta" name="input1" type="data">
-      <label>Sequences</label>
-    </param>
-    <param name="pattern" type="text" value="">
-      <label>Search pattern</label>
-      <sanitizer>
-        <valid initial="string.printable">
-         <remove value="&apos;"/>
-        </valid>
-        <mapping initial="none">
-          <add source="&apos;" target=""/>
-        </mapping>
-      </sanitizer>
-    </param>
-    <param name="mismatch" type="text" value="0">
-      <label>Number of mismatches</label>
-    </param>
-    <param name="complement" type="select">
-      <label>Search complementary strand</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="out_format1" type="select">
-      <label>Output Report File Format</label>
-      <option value="seqtable">SeqTable</option>
-      <option value="embl">EMBL</option>
-      <option value="genbank">GENBANK</option>
-      <option value="gff">GFF</option>
-      <option value="pir">PIR</option>
-      <option value="swiss">SwissProt</option>
-      <option value="dbmotif">DbMotif</option>
-      <option value="diffseq">Diffseq</option>
-      <option value="excel">Excel (tab delimited)</option>
-      <option value="feattable">FeatTable</option>
-      <option value="motif">Motif</option>
-      <option value="regions">Regions</option>
+<tool id="EMBOSS: fuzznuc37" name="fuzznuc" version="5.0.2">
+  <description>Nucleic acid pattern search</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>fuzznuc -sequence '$input1' -outfile '$out_file1' -pattern '$pattern' -pmismatch $mismatch -complement $complement -rformat2 $out_format1 -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="fasta" label="Sequences" />
+    <param name="pattern" type="text" value="" label="Search pattern">
+      <sanitizer>
+        <valid initial="string.printable">
+         <remove value="&apos;"/>
+        </valid>
+        <mapping initial="none">
+          <add source="&apos;" target=""/>
+        </mapping>
+      </sanitizer>
+    </param>
+    <param name="mismatch" type="integer" value="0" label="Number of mismatches" />
+    <param name="complement" type="select" label="Search complementary strand">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="out_format1" type="select" label="Output report file format">
+      <option value="seqtable">SeqTable</option>
+      <option value="embl">EMBL</option>
+      <option value="genbank">GENBANK</option>
+      <option value="gff">GFF</option>
+      <option value="pir">PIR</option>
+      <option value="swiss">SwissProt</option>
+      <option value="dbmotif">DbMotif</option>
+      <option value="diffseq">Diffseq</option>
+      <option value="excel">Excel (tab delimited)</option>
+      <option value="feattable">FeatTable</option>
+      <option value="motif">Motif</option>
+      <option value="regions">Regions</option>
       <option value="simple">SRS Simple</option>
-      <option value="fuzznuc">Fuzznuc Output File</option>
-      <option value="srs">SRS</option>
-      <option value="table">Table</option>
-      <option value="tagseq">TagSeq</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="fuzznuc" name="out_file1" />
+      <option value="fuzznuc">Fuzznuc Output File</option>
+      <option value="srs">SRS</option>
+      <option value="table">Table</option>
+      <option value="tagseq">TagSeq</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="fuzznuc" />
   </outputs>
   <tests>
     <test>
@@ -58,10 +55,8 @@
       <param name="out_format1" value="excel"/>
       <output name="out_file1" file="emboss_fuzznuc_out.tabular"/>
     </test>
-  </tests>
-  <code file="emboss_format_corrector.py" />
+  </tests>
   <help>
-
 .. class:: warningmark
 
 The input dataset needs to be sequences.
@@ -69,15 +64,8 @@
 -----
 
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/fuzznuc.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/fuzznuc.html
   </help>
+  <expand macro="citations" />
 </tool>
--- a/emboss_fuzzpro.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_fuzzpro.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,60 +1,50 @@
-<tool id="EMBOSS: fuzzpro38" name="fuzzpro" version="5.0.0">
-  <description>Protein pattern search</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>fuzzpro -sequence $input1 -outfile $out_file1 -pattern "$pattern" -pmismatch $mismatch -rformat2 $out_format1 -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>Sequences</label>
-    </param>
-    <param name="pattern" type="text" value="">
-      <sanitizer>
-        <valid initial="string.printable">
-         <remove value="&apos;"/>
-        </valid>
-        <mapping initial="none">
-          <add source="&apos;" target=""/>
-        </mapping>
-      </sanitizer>
-      <label>Search pattern</label>
-    </param>
-    <param name="mismatch" type="text" value="0">
-      <label>Number of mismatches</label>
-    </param>
-    <param name="out_format1" type="select">
-      <label>Output Report File Format</label>
-      <option value="seqtable">SeqTable</option>
-      <option value="embl">EMBL</option>
-      <option value="genbank">GENBANK</option>
-      <option value="gff">GFF</option>
-      <option value="pir">PIR</option>
-      <option value="swiss">SwissProt</option>
-      <option value="dbmotif">DbMotif</option>
-      <option value="diffseq">Diffseq</option>
-      <option value="excel">Excel (tab delimited)</option>
-      <option value="feattable">FeatTable</option>
-      <option value="motif">Motif</option>
-      <option value="regions">Regions</option>
-      <option value="simple">SRS Simple</option>
-      <option value="srs">SRS</option>
-      <option value="table">Table</option>
-      <option value="tagseq">TagSeq</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="fuzzpro" name="out_file1" />
-  </outputs>
-  <code file="emboss_format_corrector.py" />
-  <help>
-    You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/fuzzpro.html
-
-------
-
-**Citation**
-
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
-  </help>
-</tool>
+<tool id="EMBOSS: fuzzpro38" name="fuzzpro" version="5.0.0.1">
+  <description>Protein pattern search</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>fuzzpro -sequence '$input1' -outfile '$out_file1' -pattern '$pattern' -pmismatch $mismatch -rformat2 $out_format1 -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="Sequences" />
+    <param name="pattern" type="text" value="" label="Search pattern">
+      <sanitizer>
+        <valid initial="string.printable">
+         <remove value="&apos;"/>
+        </valid>
+        <mapping initial="none">
+          <add source="&apos;" target=""/>
+        </mapping>
+      </sanitizer>
+    </param>
+    <param name="mismatch" type="integer" value="0" label="Number of mismatches" />
+    <param name="out_format1" type="select" label="Output report file format">
+      <option value="seqtable">SeqTable</option>
+      <option value="embl">EMBL</option>
+      <option value="genbank">GENBANK</option>
+      <option value="gff">GFF</option>
+      <option value="pir">PIR</option>
+      <option value="swiss">SwissProt</option>
+      <option value="dbmotif">DbMotif</option>
+      <option value="diffseq">Diffseq</option>
+      <option value="excel">Excel (tab delimited)</option>
+      <option value="feattable">FeatTable</option>
+      <option value="motif">Motif</option>
+      <option value="regions">Regions</option>
+      <option value="simple">SRS Simple</option>
+      <option value="srs">SRS</option>
+      <option value="table">Table</option>
+      <option value="tagseq">TagSeq</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="fuzzpro" />
+  </outputs>
+  <help>
+    You can view the original documentation here_.
+
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/fuzzpro.html
+  </help>
+  <expand macro="citations" />
+</tool>
--- a/emboss_fuzztran.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_fuzztran.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,72 +1,67 @@
-<tool id="EMBOSS: fuzztran39" name="fuzztran" version="5.0.0">
-  <description>Protein pattern search after translation</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>fuzztran -sequence $input1 -outfile $out_file1 -pattern "$pattern" -pmismatch $mismatch -frame $frame -table $table -rformat2 $out_format1 -auto</command>
-  <inputs>
-    <param format="fasta" name="input1" type="data">
-      <label>Sequences</label>
-    </param>
-    <param name="pattern" type="text" value="">
-      <label>Search pattern</label>
-    </param>
-    <param name="mismatch" type="text" value="0">
-      <label>Number of mismatches</label>
-    </param>
-    <param name="frame" type="select">
-      <label>Frame(s) to translate</label>
-      <option value="1">Frame 1</option>
-      <option value="2">Frame 2</option>
-      <option value="3">Frame 3</option>
-      <option value="F">Forward three frames</option>
-      <option value="-1">Frame -1</option>
-      <option value="-2">Frame -2</option>
-      <option value="-3">Frame -3</option>
-      <option value="R">Reverse three frames</option>
-      <option value="6">All six frames</option>
-    </param>
-    <param name="table" type="select">
-      <label>Code to use</label>
-      <option value="0">Standard</option>
-      <option value="1">Standard (with alternative initiation codons)</option>
-      <option value="2">Vertebrate Mitochondrial</option>
-      <option value="3">Yeast Mitochondrial</option>
-      <option value="4">Mold, Protozoan, Coelenterate Mitochondrial and Mycoplasma/Spiroplasma</option>
-      <option value="5">Invertebrate Mitochondrial</option>
-      <option value="6">Ciliate Macronuclear and Dasycladacean</option>
-      <option value="9">Echinoderm Mitochondrial</option>
-      <option value="10">Euplotid Nuclear</option>
-      <option value="11">Bacterial</option>
-      <option value="12">Alternative Yeast Nuclear</option>
-      <option value="13">Ascidian Mitochondrial</option>
-      <option value="14">Flatworm Mitochondrial</option>
-      <option value="15">Blepharisma Macronuclear</option>
-      <option value="16">Chlorophycean Mitochondrial</option>
-      <option value="21">Trematode Mitochondrial</option>
-      <option value="22">Scenedesmus obliquus</option>
-      <option value="23">Thraustochytrium Mitochondrial</option>
-    </param>
-    <param name="out_format1" type="select">
-      <label>Output Report File Format</label>
-      <option value="table">Table</option>
-      <option value="embl">EMBL</option>
-      <option value="genbank">GENBANK</option>
-      <option value="gff">GFF</option>
-      <option value="pir">PIR</option>
-      <option value="swiss">SwissProt</option>
-      <option value="dbmotif">DbMotif</option>
-      <option value="diffseq">Diffseq</option>
-      <option value="excel">Excel (tab delimited)</option>
-      <option value="feattable">FeatTable</option>
-      <option value="motif">Motif</option>
-      <option value="regions">Regions</option>
-      <option value="seqtable">SeqTable</option>
-      <option value="simple">SRS Simple</option>
-      <option value="srs">SRS</option>
-      <option value="tagseq">TagSeq</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="fuzztran" name="out_file1" />
+<tool id="EMBOSS: fuzztran39" name="fuzztran" version="5.0.0.1">
+  <description>Protein pattern search after translation</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>fuzztran -sequence '$input1' -outfile '$out_file1' -pattern '$pattern' -pmismatch $mismatch -frame $frame -table $table -rformat2 $out_format1 -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="fasta" label="Sequences" />
+    <param name="pattern" type="text" value="" label="Search pattern" />
+    <param name="mismatch" type="integer" value="0" label="Number of mismatches" />
+    <param name="frame" type="select" label="Frame(s) to translate">
+      <option value="1">Frame 1</option>
+      <option value="2">Frame 2</option>
+      <option value="3">Frame 3</option>
+      <option value="F">Forward three frames</option>
+      <option value="-1">Frame -1</option>
+      <option value="-2">Frame -2</option>
+      <option value="-3">Frame -3</option>
+      <option value="R">Reverse three frames</option>
+      <option value="6">All six frames</option>
+    </param>
+    <param name="table" type="select" label="Code to use">
+      <option value="0">Standard</option>
+      <option value="1">Standard (with alternative initiation codons)</option>
+      <option value="2">Vertebrate Mitochondrial</option>
+      <option value="3">Yeast Mitochondrial</option>
+      <option value="4">Mold, Protozoan, Coelenterate Mitochondrial and Mycoplasma/Spiroplasma</option>
+      <option value="5">Invertebrate Mitochondrial</option>
+      <option value="6">Ciliate Macronuclear and Dasycladacean</option>
+      <option value="9">Echinoderm Mitochondrial</option>
+      <option value="10">Euplotid Nuclear</option>
+      <option value="11">Bacterial</option>
+      <option value="12">Alternative Yeast Nuclear</option>
+      <option value="13">Ascidian Mitochondrial</option>
+      <option value="14">Flatworm Mitochondrial</option>
+      <option value="15">Blepharisma Macronuclear</option>
+      <option value="16">Chlorophycean Mitochondrial</option>
+      <option value="21">Trematode Mitochondrial</option>
+      <option value="22">Scenedesmus obliquus</option>
+      <option value="23">Thraustochytrium Mitochondrial</option>
+    </param>
+    <param name="out_format1" type="select" label="Output report file format">
+      <option value="table">Table</option>
+      <option value="embl">EMBL</option>
+      <option value="genbank">GENBANK</option>
+      <option value="gff">GFF</option>
+      <option value="pir">PIR</option>
+      <option value="swiss">SwissProt</option>
+      <option value="dbmotif">DbMotif</option>
+      <option value="diffseq">Diffseq</option>
+      <option value="excel">Excel (tab delimited)</option>
+      <option value="feattable">FeatTable</option>
+      <option value="motif">Motif</option>
+      <option value="regions">Regions</option>
+      <option value="seqtable">SeqTable</option>
+      <option value="simple">SRS Simple</option>
+      <option value="srs">SRS</option>
+      <option value="tagseq">TagSeq</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="fuzztran" />
   </outputs>
   <tests>
     <test>
@@ -78,10 +73,8 @@
       <param name="out_format1" value="excel"/>
       <output name="out_file1" file="emboss_fuzztran_out.tabular"/>
     </test>
-  </tests>
-  <code file="emboss_format_corrector.py" />
+  </tests>
   <help>
-
 .. class:: warningmark
 
 The input dataset needs to be sequences.
@@ -89,15 +82,8 @@
 -----
 
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/fuzztran.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/fuzztran.html
   </help>
+  <expand macro="citations" />
 </tool>
--- a/emboss_garnier.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_garnier.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,45 +1,43 @@
-<tool id="EMBOSS: garnier40" name="garnier" version="5.0.0">
-  <description>Predicts protein secondary structure</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>garnier -sequence $input1 -outfile $out_file1 -idc $idc -rformat2 $out_format1 -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>Sequences</label>
-    </param>
-    <param name="idc" type="select">
-      <label>In their paper, GOR mention that if you know something about the secondary structure content of the protein you are analyzing, you can do better in prediction. 'idc' is an index into a
-      set of arrays, dharr[] and dsarr[], which provide 'decision constants' (dch, dcs), which are offsets that are applied to the weights for the helix and sheet (extend) terms. So, idc=0 says don't
-      use the decision constant offsets, and idc=1 to 6 indicates that various combinations of dch,dcs offsets should be used</label>
-      <option value="0">idc 0</option>
-      <option value="1">idc 1</option>
-      <option value="2">idc 2</option>
-      <option value="3">idc 3</option>
-      <option value="4">idc 4</option>
-      <option value="5">idc 5</option>
-      <option value="6">idc 6</option>
-    </param>
-    <param name="out_format1" type="select">
-      <label>Output Report File Format</label>
-      <option value="tagseq">TagSeq</option>
-      <option value="embl">EMBL</option>
-      <option value="genbank">GENBANK</option>
-      <option value="gff">GFF</option>
-      <option value="pir">PIR</option>
-      <option value="swiss">SwissProt</option>
-      <option value="dbmotif">DbMotif</option>
-      <option value="diffseq">Diffseq</option>
-      <option value="excel">Excel (tab delimited)</option>
-      <option value="feattable">FeatTable</option>
-      <option value="motif">Motif</option>
-      <option value="regions">Regions</option>
-      <option value="seqtable">SeqTable</option>
-      <option value="simple">SRS Simple</option>
-      <option value="srs">SRS</option>
-      <option value="table">Table</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="garnier" name="out_file1" />
+<tool id="EMBOSS: garnier40" name="garnier" version="5.0.0">
+  <description>Predicts protein secondary structure</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>garnier -sequence '$input1' -outfile '$out_file1' -idc $idc -rformat2 $out_format1 -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="Sequences" />
+    <param name="idc" type="select" label="idc" help="In their paper, GOR mention that if you know something about the secondary structure content of the protein you are analyzing, you can do better in prediction. 'idc' is an index into a set of arrays, dharr[] and dsarr[], which provide 'decision constants' (dch, dcs), which are offsets that are applied to the weights for the helix and sheet (extend) terms. So, idc=0 says don't use the decision constant offsets, and idc=1 to 6 indicates that various combinations of dch,dcs offsets should be used">
+      <option value="0">idc 0</option>
+      <option value="1">idc 1</option>
+      <option value="2">idc 2</option>
+      <option value="3">idc 3</option>
+      <option value="4">idc 4</option>
+      <option value="5">idc 5</option>
+      <option value="6">idc 6</option>
+    </param>
+    <param name="out_format1" type="select" label="Output report file format">
+      <option value="tagseq">TagSeq</option>
+      <option value="embl">EMBL</option>
+      <option value="genbank">GENBANK</option>
+      <option value="gff">GFF</option>
+      <option value="pir">PIR</option>
+      <option value="swiss">SwissProt</option>
+      <option value="dbmotif">DbMotif</option>
+      <option value="diffseq">Diffseq</option>
+      <option value="excel">Excel (tab delimited)</option>
+      <option value="feattable">FeatTable</option>
+      <option value="motif">Motif</option>
+      <option value="regions">Regions</option>
+      <option value="seqtable">SeqTable</option>
+      <option value="simple">SRS Simple</option>
+      <option value="srs">SRS</option>
+      <option value="table">Table</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="garnier" />
   </outputs>
   <tests>
     <test>
@@ -48,19 +46,11 @@
       <param name="out_format1" value="excel"/>
       <output name="out_file1" file="emboss_garnier_out.tabular"/>
     </test>
-  </tests>
-  <code file="emboss_format_corrector.py" />
+  </tests>
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/4.0/emboss/apps/garnier.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: https://galaxy-iuc.github.io/emboss-5.0-docs/garnier.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_geecee.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_geecee.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,32 +1,26 @@
-<tool id="EMBOSS: geecee41" name="geecee" version="5.0.0">
-  <description>Calculates fractional GC content of nucleic acid sequences</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>geecee -sequence $input1 -outfile $out_file1 -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>Sequences</label>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="geecee" name="out_file1" />
+<tool id="EMBOSS: geecee41" name="geecee" version="5.0.0">
+  <description>Calculates fractional GC content of nucleic acid sequences</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <command>geecee -sequence '$input1' -outfile '$out_file1' -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="Sequences" />
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="geecee" />
   </outputs>
   <tests>
     <test>
       <param name="input1" value="2.fasta"/>
       <output name="out_file1" file="emboss_geecee_out.geecee"/>
     </test>
-  </tests>
+  </tests>
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/geecee.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/geecee.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_getorf.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_getorf.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,102 +1,92 @@
-<tool id="EMBOSS: getorf42" name="getorf" version="5.0.0">
-  <description>Finds and extracts open reading frames (ORFs)</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>getorf -sequence $input1 -outseq $out_file1 -table $table -minsize $minsize -maxsize $maxsize -find $find -methionine $methionine -circular $circular -reverse $reverse -flanking $flanking
-  -osformat2 $out_format1 -auto</command>
-  <inputs>
-    <param format="fasta" name="input1" type="data">
-      <label>Sequences</label>
-    </param>
-    <param name="table" type="select">
-      <label>Code to use</label>
-      <option value="0">Standard</option>
-      <option value="1">Standard (with alternative initiation codons)</option>
-      <option value="2">Vertebrate Mitochondrial</option>
-      <option value="3">Yeast Mitochondrial</option>
-      <option value="4">Mold, Protozoan, Coelenterate Mitochondrial and Mycoplasma/Spiroplasma</option>
-      <option value="5">Invertebrate Mitochondrial</option>
-      <option value="6">Ciliate Macronuclear and Dasycladacean</option>
-      <option value="9">Echinoderm Mitochondrial</option>
-      <option value="10">Euplotid Nuclear</option>
-      <option value="11">Bacterial</option>
-      <option value="12">Alternative Yeast Nuclear</option>
-      <option value="13">Ascidian Mitochondrial</option>
-      <option value="14">Flatworm Mitochondrial</option>
-      <option value="15">Blepharisma Macronuclear</option>
-      <option value="16">Chlorophycean Mitochondrial</option>
-      <option value="21">Trematode Mitochondrial</option>
-      <option value="22">Scenedesmus obliquus</option>
-      <option value="23">Thraustochytrium Mitochondrial</option>
-    </param>
-    <param name="minsize" type="text" value="30">
-      <label>Minimum nucleotide size of ORF to report</label>
-    </param>
-    <param name="maxsize" type="text" value="1000000">
-      <label>Maximum nucleotide size of ORF to report</label>
-    </param>
-    <param name="find" type="select">
-      <label>What to output</label>
-      <option value="0">Translation of regions between STOP codons</option>
-      <option value="1">Translation of regions between START and STOP codons</option>
-      <option value="2">Nucleic sequences between STOP codons</option>
-      <option value="3">Nucleic sequences between START and STOP codons</option>
-      <option value="4">Nucleotides flanking START codons</option>
-      <option value="5">Nucleotides flanking initial STOP codons</option>
-      <option value="6">Nucleotides flanking ending STOP codons</option>
-    </param>
-    <param name="methionine" type="select">
-      <label>All START codons to code for Methionine</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="circular" type="select">
-      <label>Circular sequence</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="reverse" type="select">
-      <label>Find ORFs in the reverse complement</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="flanking" type="text" value="100">
-      <label>Number of flanking nucleotides to output</label>
-    </param>
-    <param name="out_format1" type="select">
-      <label>Output Sequence File Format</label>
-      <option value="fasta">FASTA (m)</option>
-      <option value="acedb">ACeDB (m)</option>
-      <option value="asn1">ASN.1 (m)</option>
-      <option value="clustal">Clustal (m)</option>
-      <option value="codata">CODATA (m)</option>
-      <option value="embl">EMBL (m)</option>
-      <option value="fitch">Fitch (m)</option>
-      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
-      <option value="genbank">GENBANK (m)</option>
-      <!-- <option value="gff">GFF (m)</option> -->
-      <option value="hennig86">Hennig86 (m)</option>
-      <option value="ig">Intelligenetics (m)</option>
-      <option value="jackknifer">Jackknifer (m)</option>
-      <option value="jackknifernon">Jackknifernon (m)</option>
-      <option value="mega">Mega (m)</option>
-      <option value="meganon">Meganon (m)</option>
-      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
-      <option value="pir">NBRF (PIR) (m)</option>
-      <option value="ncbi">NCBI style FASTA (m)</option>
-      <option value="nexus">Nexus/PAUP (m)</option>
-      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
-      <option value="phylip">PHYLIP interleaved (m)</option>
-      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
-      <option value="selex">SELEX (m)</option>
-      <option value="staden">Staden (s)</option>
-      <option value="strider">DNA strider (m)</option>
-      <option value="swiss">SwisProt entry (m)</option>
-      <option value="text">Plain sequence (s)</option>
-      <option value="treecon">Treecon (m)</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="fasta" name="out_file1" />
+<tool id="EMBOSS: getorf42" name="getorf" version="5.0.0.1">
+  <description>Finds and extracts open reading frames (ORFs)</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>getorf -sequence '$input1' -outseq '$out_file1' -table $table -minsize $minsize -maxsize $maxsize -find $find -methionine $methionine -circular $circular -reverse $reverse -flanking $flanking
+  -osformat2 $out_format1 -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="fasta" label="Sequences" />
+    <param name="table" type="select" label="Code to use">
+      <option value="0">Standard</option>
+      <option value="1">Standard (with alternative initiation codons)</option>
+      <option value="2">Vertebrate Mitochondrial</option>
+      <option value="3">Yeast Mitochondrial</option>
+      <option value="4">Mold, Protozoan, Coelenterate Mitochondrial and Mycoplasma/Spiroplasma</option>
+      <option value="5">Invertebrate Mitochondrial</option>
+      <option value="6">Ciliate Macronuclear and Dasycladacean</option>
+      <option value="9">Echinoderm Mitochondrial</option>
+      <option value="10">Euplotid Nuclear</option>
+      <option value="11">Bacterial</option>
+      <option value="12">Alternative Yeast Nuclear</option>
+      <option value="13">Ascidian Mitochondrial</option>
+      <option value="14">Flatworm Mitochondrial</option>
+      <option value="15">Blepharisma Macronuclear</option>
+      <option value="16">Chlorophycean Mitochondrial</option>
+      <option value="21">Trematode Mitochondrial</option>
+      <option value="22">Scenedesmus obliquus</option>
+      <option value="23">Thraustochytrium Mitochondrial</option>
+    </param>
+    <param name="minsize" type="integer" value="30" label="Minimum nucleotide size of ORF to report" />
+    <param name="maxsize" type="integer" value="1000000" label="Maximum nucleotide size of ORF to report" />
+    <param name="find" type="select" label="What to output">
+      <option value="0">Translation of regions between STOP codons</option>
+      <option value="1">Translation of regions between START and STOP codons</option>
+      <option value="2">Nucleic sequences between STOP codons</option>
+      <option value="3">Nucleic sequences between START and STOP codons</option>
+      <option value="4">Nucleotides flanking START codons</option>
+      <option value="5">Nucleotides flanking initial STOP codons</option>
+      <option value="6">Nucleotides flanking ending STOP codons</option>
+    </param>
+    <param name="methionine" type="select" label="All START codons to code for Methionine">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="circular" type="select" label="Circular sequence">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="reverse" type="select" label="Find ORFs in the reverse complement">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="flanking" type="integer" value="100" label="Number of flanking nucleotides to output" />
+    <param name="out_format1" type="select" label="Output sequence file format">
+      <option value="fasta">FASTA (m)</option>
+      <option value="acedb">ACeDB (m)</option>
+      <option value="asn1">ASN.1 (m)</option>
+      <option value="clustal">Clustal (m)</option>
+      <option value="codata">CODATA (m)</option>
+      <option value="embl">EMBL (m)</option>
+      <option value="fitch">Fitch (m)</option>
+      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
+      <option value="genbank">GENBANK (m)</option>
+      <!-- <option value="gff">GFF (m)</option> -->
+      <option value="hennig86">Hennig86 (m)</option>
+      <option value="ig">Intelligenetics (m)</option>
+      <option value="jackknifer">Jackknifer (m)</option>
+      <option value="jackknifernon">Jackknifernon (m)</option>
+      <option value="mega">Mega (m)</option>
+      <option value="meganon">Meganon (m)</option>
+      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
+      <option value="pir">NBRF (PIR) (m)</option>
+      <option value="ncbi">NCBI style FASTA (m)</option>
+      <option value="nexus">Nexus/PAUP (m)</option>
+      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
+      <option value="phylip">PHYLIP interleaved (m)</option>
+      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
+      <option value="selex">SELEX (m)</option>
+      <option value="staden">Staden (s)</option>
+      <option value="strider">DNA strider (m)</option>
+      <option value="swiss">SwisProt entry (m)</option>
+      <option value="text">Plain sequence (s)</option>
+      <option value="treecon">Treecon (m)</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="fasta" />
   </outputs>
   <tests>
     <test>
@@ -112,10 +102,8 @@
       <param name="out_format1" value="fasta"/>
       <output name="out_file1" file="emboss_getorf_out.fasta"/>
     </test>
-  </tests>
-  <code file="emboss_format_corrector.py" />
+  </tests>
   <help>
-
 .. class:: warningmark
 
 The input dataset needs to be sequences.
@@ -123,15 +111,8 @@
 -----
 
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/getorf.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/getorf.html
   </help>
+  <expand macro="citations" />
 </tool>
--- a/emboss_helixturnhelix.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_helixturnhelix.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,47 +1,41 @@
-<tool id="EMBOSS: helixturnhelix43" name="helixturnhelix" version="5.0.0">
-  <description>Report nucleic acid binding motifs</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>helixturnhelix -sequence $input1 -outfile $out_file1 -mean $mean -sd $sd -minsd $minsd -eightyseven $eightyseven -rformat2 $out_format1 -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>Sequences</label>
-    </param>
-    <param name="mean" type="text" value="238.71">
-      <label>Mean value</label>
-    </param>
-    <param name="sd" type="text" value="293.61">
-      <label>Standard Deviation value</label>
-    </param>
-    <param name="minsd" type="text" value="2.5">
-      <label>Minimum SD</label>
-    </param>
-    <param name="eightyseven" type="select">
-      <label>Use the old (1987) weight data</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="out_format1" type="select">
-      <label>Output Report File Format</label>
-      <option value="motif">Motif</option>
-      <option value="embl">EMBL</option>
-      <option value="genbank">GENBANK</option>
-      <option value="gff">GFF</option>
-      <option value="pir">PIR</option>
-      <option value="swiss">SwissProt</option>
-      <option value="dbmotif">DbMotif</option>
-      <option value="diffseq">Diffseq</option>
-      <option value="excel">Excel (tab delimited)</option>
-      <option value="feattable">FeatTable</option>
-      <option value="regions">Regions</option>
-      <option value="seqtable">SeqTable</option>
-      <option value="simple">SRS Simple</option>
-      <option value="srs">SRS</option>
-      <option value="table">Table</option>
-      <option value="tagseq">TagSeq</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="motif" name="out_file1" />
+<tool id="EMBOSS: helixturnhelix43" name="helixturnhelix" version="5.0.0.1">
+  <description>Report nucleic acid binding motifs</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>helixturnhelix -sequence '$input1' -outfile '$out_file1' -mean $mean -sd $sd -minsd $minsd -eightyseven $eightyseven -rformat2 $out_format1 -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="Sequences" />
+    <param name="mean" type="float" value="238.71" label="Mean value" />
+    <param name="sd" type="float" value="293.61" label="Standard deviation value" />
+    <param name="minsd" type="float" value="2.5" label="Minimum SD" />
+    <param name="eightyseven" type="select" label="Use the old (1987) weight data">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="out_format1" type="select" label="Output report file format">
+      <option value="motif">Motif</option>
+      <option value="embl">EMBL</option>
+      <option value="genbank">GENBANK</option>
+      <option value="gff">GFF</option>
+      <option value="pir">PIR</option>
+      <option value="swiss">SwissProt</option>
+      <option value="dbmotif">DbMotif</option>
+      <option value="diffseq">Diffseq</option>
+      <option value="excel">Excel (tab delimited)</option>
+      <option value="feattable">FeatTable</option>
+      <option value="regions">Regions</option>
+      <option value="seqtable">SeqTable</option>
+      <option value="simple">SRS Simple</option>
+      <option value="srs">SRS</option>
+      <option value="table">Table</option>
+      <option value="tagseq">TagSeq</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="motif" />
   </outputs>
   <tests>
     <test>
@@ -53,19 +47,11 @@
       <param name="out_format1" value="excel"/>
       <output name="out_file1" file="emboss_helixturnhelix_out.tabular"/>
     </test>
-  </tests>
-  <code file="emboss_format_corrector.py" />
+  </tests>
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/helixturnhelix.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/helixturnhelix.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_hmoment.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_hmoment.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,20 +1,17 @@
-<tool id="EMBOSS: hmoment44" name="hmoment" version="5.0.0">
-  <description>Hydrophobic moment calculation</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>hmoment -seqall $input1 -outfile $out_file1 -window $window -aangle $aangle -graph png -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>Sequences</label>
-    </param>
-    <param name="window" type="text" value="10">
-      <label>Window</label>
-    </param>
-    <param name="aangle" type="text" value="100">
-      <label>Alpha helix angle (degrees)</label>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="hmoment" name="out_file1" />
+<tool id="EMBOSS: hmoment44" name="hmoment" version="5.0.0.1">
+  <description>Hydrophobic moment calculation</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <command>hmoment -seqall '$input1' -outfile '$out_file1' -window $window -aangle $aangle -graph png -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="Sequences" />
+    <param name="window" type="integer" value="10" label="Window" />
+    <param name="aangle" type="integer" value="100" label="Alpha helix angle (degrees)" />
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="hmoment" />
   </outputs>
     <tests>
     <test>
@@ -23,18 +20,11 @@
       <param name="aangle" value="100"/>
       <output name="out_file1" file="emboss_hmoment_out.hmoment"/>
     </test>
-  </tests>
+  </tests>
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/hmoment.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/hmoment.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_iep.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_iep.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,25 +1,21 @@
-<tool id="EMBOSS: iep45" name="iep" version="5.0.0">
-  <description>Calculates the isoelectric point of a protein</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>iep -sequence $input1 -outfile $out_file1 -step $step -amino $amino -graph png -termini $termini -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>Sequences</label>
-    </param>
-    <param name="step" type="text" value=".5">
-      <label>Step value for pH</label>
-    </param>
-    <param name="amino" type="text" value="1">
-      <label>Number of N-termini</label>
-    </param>
-    <param name="termini" type="select">
-      <label>Include charge at N and C terminus</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="iep" name="out_file1" />
+<tool id="EMBOSS: iep45" name="iep" version="5.0.0.1">
+  <description>Calculates the isoelectric point of a protein</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <command>iep -sequence '$input1' -outfile '$out_file1' -step $step -amino $amino -graph png -termini $termini -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="Sequences" />
+    <param name="step" type="float" value="0.5" label="Step value for pH" />
+    <param name="amino" type="integer" value="1" label="Number of N-termini" />
+    <param name="termini" type="select" label="Include charge at N and C terminus">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="iep" />
   </outputs>
   <tests>
     <test>
@@ -29,18 +25,11 @@
       <param name="termini" value="yes"/>
       <output name="out_file1" file="emboss_iep_out.iep"/>
     </test>
-  </tests>
+  </tests>
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/iep.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/iep.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_infoseq.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_infoseq.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,84 +1,67 @@
-<tool id="EMBOSS: infoseq46" name="infoseq" version="5.0.0">
+<tool id="EMBOSS: infoseq46" name="infoseq" version="5.0.0">
   <!-- info contains file information always -->
-  <description>Displays some simple information about sequences</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>infoseq -sequence $input1 -outfile $out_file1 -html $html_out1 -heading $heading -usa $usa -name $disname -accession $accession -gi $gi -version $version -type $type -length $length -pgc
-  $pgc -description $description -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>Sequences</label>
-    </param>
-    <param name="html_out1" type="select">
-      <label>Format output as an HTML table</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="heading" type="select">
-      <label>Display column headings</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="usa" type="select">
-      <label>Display the USA of the sequence</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="disname" type="select">
-      <label>Display 'name' column</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="accession" type="select">
-      <label>Display 'accession' column</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="gi" type="select">
-      <label>Display 'GI' column</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="version" type="select">
-      <label>Display 'version' column</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="type" type="select">
-      <label>Display 'type' column</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="length" type="select">
-      <label>Display 'length' column</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="pgc" type="select">
-      <label>Display 'percent GC content' column</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="description" type="select">
-      <label>Display 'description' column</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="txt" name="out_file1" />
-  </outputs>
-  <code file="emboss_format_corrector.py" />
+  <description>Displays some simple information about sequences</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>infoseq -sequence '$input1' -outfile '$out_file1' -html $html_out1 -heading $heading -usa $usa -name $disname -accession $accession -gi $gi -version $version -type $type -length $length -pgc
+  $pgc -description $description -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="Sequences" />
+    <param name="html_out1" type="select" label="Format output as an HTML table">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="heading" type="select" label="Display column headings">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="usa" type="select" label="Display the USA of the sequence">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="disname" type="select" label="Display 'name' column">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="accession" type="select" label="Display 'accession' column">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="gi" type="select" label="Display 'GI' column">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="version" type="select" label="Display 'version' column">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="type" type="select" label="Display 'type' column">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="length" type="select" label="Display 'length' column">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="pgc" type="select" label="Display 'percent GC content' column">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="description" type="select" label="Display 'description' column">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="txt" />
+  </outputs>
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/infoseq.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/infoseq.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_isochore.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_isochore.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,29 +1,25 @@
-<tool id="EMBOSS: isochore47" name="isochore" version="5.0.0">
+<tool id="EMBOSS: isochore47" name="isochore" version="5.0.0.1">
   <description>Plots isochores in large DNA sequences</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command interpreter="perl">emboss_single_outputfile_wrapper.pl isochore -sequence $input1 -outfile $ofile2 -goutfile $ofile1 -graph png -window $window -shift $shift -auto</command>
-  <!--  <command interpreter="perl">emboss_single_outputfile_wrapper.pl isochore -sequence $input1 -goutfile $ofile1 -graph png -window $window -shift $shift -auto</command>-->
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <command>perl '$__tool_directory__/emboss_single_outputfile_wrapper.pl' isochore -sequence '$input1' -outfile '$ofile2' -goutfile '$ofile1' -graph png -window $window -shift $shift -auto</command>
   <inputs>
-    <param format="fasta" name="input1" type="data">
-      <label>Sequences</label>
-    </param>
-    <param name="window" type="text" value="1000">
-      <label>Window size</label>
-    </param>
-    <param name="shift" type="text" value="100">
-      <label>Shift increment</label>
-    </param>
+    <param name="input1" type="data" format="fasta" label="Sequences" />
+    <param name="window" type="integer" value="1000" label="Window size" />
+    <param name="shift" type="integer" value="100" label="Shift increment" />
   </inputs>
   <outputs>
-    <data format="png" name="ofile1" />
-    <data format="isochore" name="ofile2" />
+    <data name="ofile1" format="png" />
+    <data name="ofile2" format="isochore" />
   </outputs>
   <!-- <tests>
     <test>
       <param name="input1" value="2.fasta"/>
       <param name="window" value="1000"/>
       <param name="shift" value="100"/>
-      <output name="ofile1" file="emboss_isochore_out.isochore"/> 
+      <output name="ofile1" file="emboss_isochore_out.isochore"/>
       <output name="ofile2" file="emboss_isochore_out.isochore"/>
     </test>
          <test>
@@ -31,10 +27,9 @@
       <param name="window" value="1000"/>
       <param name="shift" value="100"/>
       <output name="ofile2" file="emboss_isochore_out.isochore"/>
-    </test> 
+    </test>
   </tests>-->
   <help>
-
 .. class:: warningmark
 
 The input dataset needs to be sequences.
@@ -43,9 +38,9 @@
 
 **Syntax**
 
-This application plots GC content over a sequence. It is intended for large sequences such as complete chromosomes or large genomic contigs, although interesting results can also be obtained from shorter sequences. You can view the original documentation here_.    
+This application plots GC content over a sequence. It is intended for large sequences such as complete chromosomes or large genomic contigs, although interesting results can also be obtained from shorter sequences. You can view the original documentation here_.
 
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/isochore.html
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/isochore.html
 
 - Both **Window size** and **Shift increment** are intergers.
 
@@ -77,14 +72,6 @@
 - Output graphics file:
 
 .. image:: ./static/emboss_icons/isochore.png
-
-------
-
-**Citation**
-
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
-
   </help>
+  <expand macro="citations" />
 </tool>
--- a/emboss_lindna.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_lindna.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,107 +1,72 @@
-<tool id="EMBOSS: lindna48" name="lindna" version="5.0.0">
+<tool id="EMBOSS: lindna48" name="lindna" version="5.0.0.1">
   <!-- tool produces memory error in ajmem.c -->
-  <description>Draws linear maps of DNA constructs</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>lindna -infile $input1 -graphout png -goutfile $out_file1 -ruler $ruler -blocktype $blocktype -maxgroups $maxgroups -maxlabels $maxlabels -intersymbol $intersymbol -intercolour $intercolour
-  -interticks $interticks -gapsize $gapsize -ticklines $ticklines -textheight $textheight -textlength $textlength -margin $margin -tickheight $tickheight -blockheight $blockheight -rangeheight
-  $rangeheight -gapgroup $gapgroup -postext $postext -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>Sequences</label>
-    </param>
-    <param name="ruler" type="select">
-      <label>Draw a ruler</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="blocktype" type="select">
-      <label>Type of blocks</label>
-      <option value="Filled">Filled blocks</option>
-      <option value="Open">Open blocks</option>
-      <option value="Outline">Black border</option>
-    </param>
-    <param name="maxgroups" type="text" value="20">
-      <label>Maximum number of groups</label>
-    </param>
-    <param name="maxlabels" type="text" value="10000">
-      <label>Maximum number of labels</label>
-    </param>
-    <param name="intersymbol" type="select">
-      <label>Type of blocks</label>
-      <option value="Straight">Straight</option>
-    </param>
-    <param name="intercolour" type="select">
-      <label>Colour of junctions between blocks</label>
-      <option value="1">Red</option>
-      <option value="0">Black</option>
-      <option value="2">Yellow</option>
-      <option value="3">Green</option>
-      <option value="4">Aquamarine</option>
-      <option value="5">Pink</option>
-      <option value="6">Wheat</option>
-      <option value="7">Grey</option>
-      <option value="8">Brown</option>
-      <option value="9">Blue</option>
-      <option value="10">Blue-violet</option>
-      <option value="11">Cyan</option>
-      <option value="12">Turquoise</option>
-      <option value="13">Magenta</option>
-      <option value="14">Salmon</option>
-      <option value="15">White</option>
-    </param>
-    <param name="interticks" type="select">
-      <label>Horizontal junctions between ticks</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="gapsize" type="text" value="500">
-      <label>Interval between ticks in the ruler</label>
-    </param>
-    <param name="ticklines" type="select">
-      <label>Vertical lines at the ruler's ticks</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="textheight" type="text" value="1.0">
-      <label>Height of text. Enter a number &lt;1.0 or &gt;1.0 to decrease or increase the size, respectively</label>
-    </param>
-    <param name="textlength" type="text" value="1.0">
-      <label>Length of text. Enter a number &lt;1.0 or &gt;1.0 to decrease or increase the size, respectively</label>
-    </param>
-    <param name="margin" type="text" value="1.0">
-      <label>Width of left margin. This is the region left to the groups where the names of the groups are displayed. Enter a number &lt;1.0 or &gt;1.0 to decrease or increase the size,
-      respectively</label>
-    </param>
-    <param name="tickheight" type="text" value="1.0">
-      <label>Height of ticks. Enter a number &lt;1.0 or &gt;1.0 to decrease or increase the size, respectively</label>
-    </param>
-    <param name="blockheight" type="text" value="1.0">
-      <label>Height of blocks. Enter a number &lt;1.0 or &gt;1.0 to decrease or increase the size, respectively</label>
-    </param>
-    <param name="rangeheight" type="text" value="1.0">
-      <label>Height of range ends. Enter a number &lt;1.0 or &gt;1.0 to decrease or increase the size, respectively</label>
-    </param>
-    <param name="gapgroup" type="text" value="1.0">
-      <label>Space between groups. Enter a number &lt;1.0 or &gt;1.0 to decrease or increase the size, respectively</label>
-    </param>
-    <param name="postext" type="text" value="1.0">
-      <label>Space between text and ticks, blocks, and ranges. Enter a number &lt;1.0 or &gt;1.0 to decrease or increase the size, respectively</label>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="png" name="out_file1" />
-  </outputs>
+  <description>Draws linear maps of DNA constructs</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <command>lindna -infile '$input1' -graphout png -goutfile '$out_file1' -ruler $ruler -blocktype $blocktype -maxgroups $maxgroups -maxlabels $maxlabels -intersymbol $intersymbol -intercolour $intercolour
+  -interticks $interticks -gapsize $gapsize -ticklines $ticklines -textheight $textheight -textlength $textlength -margin $margin -tickheight $tickheight -blockheight $blockheight -rangeheight
+  $rangeheight -gapgroup $gapgroup -postext $postext -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="Sequences" />
+    <param name="ruler" type="select" label="Draw a ruler">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="blocktype" type="select" label="Type of blocks">
+      <option value="Filled">Filled blocks</option>
+      <option value="Open">Open blocks</option>
+      <option value="Outline">Black border</option>
+    </param>
+    <param name="maxgroups" type="integer" value="20" label="Maximum number of groups" />
+    <param name="maxlabels" type="integer" value="10000" label="Maximum number of labels" />
+    <param name="intersymbol" type="select" label="Type of blocks">
+      <option value="Straight">Straight</option>
+    </param>
+    <param name="intercolour" type="select" label="Colour of junctions between blocks">
+      <option value="1">Red</option>
+      <option value="0">Black</option>
+      <option value="2">Yellow</option>
+      <option value="3">Green</option>
+      <option value="4">Aquamarine</option>
+      <option value="5">Pink</option>
+      <option value="6">Wheat</option>
+      <option value="7">Grey</option>
+      <option value="8">Brown</option>
+      <option value="9">Blue</option>
+      <option value="10">Blue-violet</option>
+      <option value="11">Cyan</option>
+      <option value="12">Turquoise</option>
+      <option value="13">Magenta</option>
+      <option value="14">Salmon</option>
+      <option value="15">White</option>
+    </param>
+    <param name="interticks" type="select" label="Horizontal junctions between ticks">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="gapsize" type="integer" value="500" label="Interval between ticks in the ruler" />
+    <param name="ticklines" type="select" label="Vertical lines at the ruler's ticks">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="textheight" type="float" value="1.0" label="Height of text" help="Enter a number &lt;1.0 or &gt;1.0 to decrease or increase the size, respectively" />
+    <param name="textlength" type="float" value="1.0" label="Length of text" help="Enter a number &lt;1.0 or &gt;1.0 to decrease or increase the size, respectively" />
+    <param name="margin" type="float" value="1.0" label="Width of left margin" help="This is the region left to the groups where the names of the groups are displayed. Enter a number &lt;1.0 or &gt;1.0 to decrease or increase the size, respectively" />
+    <param name="tickheight" type="float" value="1.0" label="Height of ticks" help="Enter a number &lt;1.0 or &gt;1.0 to decrease or increase the size, respectively" />
+    <param name="blockheight" type="float" value="1.0" label="Height of blocks" help="Enter a number &lt;1.0 or &gt;1.0 to decrease or increase the size, respectively" />
+    <param name="rangeheight" type="float" value="1.0" label="Height of range ends" help="Enter a number &lt;1.0 or &gt;1.0 to decrease or increase the size, respectively" />
+    <param name="gapgroup" type="float" value="1.0" label="Space between groups" help="Enter a number &lt;1.0 or &gt;1.0 to decrease or increase the size, respectively" />
+    <param name="postext" type="float" value="1.0" label="Space between text and ticks, blocks, and ranges" help="Enter a number &lt;1.0 or &gt;1.0 to decrease or increase the size, respectively" />
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="png" />
+  </outputs>
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/lindna.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/lindna.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_marscan.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_marscan.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,33 +1,34 @@
-<tool id="EMBOSS: marscan49" name="marscan" version="5.0.0">
-  <description>Finds MAR/SAR sites in nucleic sequences</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>marscan -sequence $input1 -outfile $out_file1 -rformat2 $out_format1 -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>Sequence</label>
-    </param>
-    <param name="out_format1" type="select">
-      <label>Output Report File Format</label>
-      <option value="gff">GFF</option>
-      <option value="embl">EMBL</option>
-      <option value="genbank">GENBANK</option>
-      <option value="pir">PIR</option>
-      <option value="swiss">SwissProt</option>
-      <option value="dbmotif">DbMotif</option>
-      <option value="diffseq">Diffseq</option>
-      <option value="excel">Excel (tab delimited)</option>
-      <option value="feattable">FeatTable</option>
-      <option value="motif">Motif</option>
-      <option value="regions">Regions</option>
-      <option value="seqtable">SeqTable</option>
-      <option value="simple">SRS Simple</option>
-      <option value="srs">SRS</option>
-      <option value="table">Table</option>
-      <option value="tagseq">TagSeq</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="gff" name="out_file1" />
+<tool id="EMBOSS: marscan49" name="marscan" version="5.0.0">
+  <description>Finds MAR/SAR sites in nucleic sequences</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>marscan -sequence '$input1' -outfile '$out_file1' -rformat2 $out_format1 -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="Sequence" />
+    <param name="out_format1" type="select" label="Output report file format">
+      <option value="gff">GFF</option>
+      <option value="embl">EMBL</option>
+      <option value="genbank">GENBANK</option>
+      <option value="pir">PIR</option>
+      <option value="swiss">SwissProt</option>
+      <option value="dbmotif">DbMotif</option>
+      <option value="diffseq">Diffseq</option>
+      <option value="excel">Excel (tab delimited)</option>
+      <option value="feattable">FeatTable</option>
+      <option value="motif">Motif</option>
+      <option value="regions">Regions</option>
+      <option value="seqtable">SeqTable</option>
+      <option value="simple">SRS Simple</option>
+      <option value="srs">SRS</option>
+      <option value="table">Table</option>
+      <option value="tagseq">TagSeq</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="gff" />
   </outputs>
   <tests>
     <test>
@@ -35,19 +36,11 @@
       <param name="out_format1" value="excel"/>
       <output name="out_file1" file="emboss_marscan_out.tabular"/>
     </test>
-  </tests>
-  <code file="emboss_format_corrector.py" />
+  </tests>
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/marscan.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/marscan.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_maskfeat.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_maskfeat.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,57 +1,53 @@
-<tool id="EMBOSS: maskfeat50" name="maskfeat" version="5.0.0">
-  <description>Mask off features of a sequence</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>maskfeat -sequence $input1 -outseq $out_file1 -type "$type" -tolower $tolower -maskchar "$maskchar" -osformat2 $out_format1 -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>Sequence</label>
-    </param>
-    <param name="type" type="text" value="repeat*">
-      <label>Feature to mask</label>
-    </param>
-    <param name="tolower" type="select">
-      <label>Mask features by converting to lowercase</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="maskchar" type="text" value="N">
-      <label>Character to mask with</label>
-    </param>
-    <param name="out_format1" type="select">
-      <label>Output Sequence File Format</label>
-      <option value="fasta">FASTA (m)</option>
-      <option value="acedb">ACeDB (m)</option>
-      <option value="asn1">ASN.1 (m)</option>
-      <option value="clustal">Clustal (m)</option>
-      <option value="codata">CODATA (m)</option>
-      <option value="embl">EMBL (m)</option>
-      <option value="fitch">Fitch (m)</option>
-      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
-      <option value="genbank">GENBANK (m)</option>
-      <option value="gff">GFF (m)</option>
-      <option value="hennig86">Hennig86 (m)</option>
-      <option value="ig">Intelligenetics (m)</option>
-      <option value="jackknifer">Jackknifer (m)</option>
-      <option value="jackknifernon">Jackknifernon (m)</option>
-      <option value="mega">Mega (m)</option>
-      <option value="meganon">Meganon (m)</option>
-      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
-      <option value="pir">NBRF (PIR) (m)</option>
-      <option value="ncbi">NCBI style FASTA (m)</option>
-      <option value="nexus">Nexus/PAUP (m)</option>
-      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
-      <option value="phylip">PHYLIP interleaved (m)</option>
-      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
-      <option value="selex">SELEX (m)</option>
-      <option value="staden">Staden (s)</option>
-      <option value="strider">DNA strider (m)</option>
-      <option value="swiss">SwisProt entry (m)</option>
-      <option value="text">Plain sequence (s)</option>
-      <option value="treecon">Treecon (m)</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="fasta" name="out_file1" />
+<tool id="EMBOSS: maskfeat50" name="maskfeat" version="5.0.0">
+  <description>Mask off features of a sequence</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>maskfeat -sequence '$input1' -outseq '$out_file1' -type '$type' -tolower $tolower -maskchar '$maskchar' -osformat2 $out_format1 -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="Sequence" />
+    <param name="type" type="text" value="repeat*" label="Feature to mask" />
+    <param name="tolower" type="select" label="Mask features by converting to lowercase">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="maskchar" type="text" value="N" label="Character to mask with" />
+    <param name="out_format1" type="select" label="Output sequence file format">
+      <option value="fasta">FASTA (m)</option>
+      <option value="acedb">ACeDB (m)</option>
+      <option value="asn1">ASN.1 (m)</option>
+      <option value="clustal">Clustal (m)</option>
+      <option value="codata">CODATA (m)</option>
+      <option value="embl">EMBL (m)</option>
+      <option value="fitch">Fitch (m)</option>
+      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
+      <option value="genbank">GENBANK (m)</option>
+      <option value="gff">GFF (m)</option>
+      <option value="hennig86">Hennig86 (m)</option>
+      <option value="ig">Intelligenetics (m)</option>
+      <option value="jackknifer">Jackknifer (m)</option>
+      <option value="jackknifernon">Jackknifernon (m)</option>
+      <option value="mega">Mega (m)</option>
+      <option value="meganon">Meganon (m)</option>
+      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
+      <option value="pir">NBRF (PIR) (m)</option>
+      <option value="ncbi">NCBI style FASTA (m)</option>
+      <option value="nexus">Nexus/PAUP (m)</option>
+      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
+      <option value="phylip">PHYLIP interleaved (m)</option>
+      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
+      <option value="selex">SELEX (m)</option>
+      <option value="staden">Staden (s)</option>
+      <option value="strider">DNA strider (m)</option>
+      <option value="swiss">SwisProt entry (m)</option>
+      <option value="text">Plain sequence (s)</option>
+      <option value="treecon">Treecon (m)</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="fasta" />
   </outputs>
   <tests>
     <test>
@@ -62,19 +58,11 @@
       <param name="out_format1" value="fasta"/>
       <output name="out_file1" file="emboss_maskfeat_out.fasta"/>
     </test>
-  </tests>
-  <code file="emboss_format_corrector.py" />
+  </tests>
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/maskfeat.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/maskfeat.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_maskseq.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_maskseq.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,57 +1,53 @@
-<tool id="EMBOSS: maskseq51" name="maskseq" version="5.0.0">
-  <description>Mask off regions of a sequence</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>maskseq -sequence $input1 -outseq $out_file1 -regions "$regions" -tolower $tolower -maskchar "$maskchar" -osformat2 $out_format1 -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>Sequence</label>
-    </param>
-    <param name="regions" type="text" value="">
-      <label>Regions to mask (Example 1-99)</label>
-    </param>
-    <param name="tolower" type="select">
-      <label>mask by converting to lowercase</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="maskchar" type="text" value="N">
-      <label>Character to use when masking</label>
-    </param>
-    <param name="out_format1" type="select">
-      <label>Output Sequence File Format</label>
-      <option value="fasta">FASTA (m)</option>
-      <option value="acedb">ACeDB (m)</option>
-      <option value="asn1">ASN.1 (m)</option>
-      <option value="clustal">Clustal (m)</option>
-      <option value="codata">CODATA (m)</option>
-      <option value="embl">EMBL (m)</option>
-      <option value="fitch">Fitch (m)</option>
-      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
-      <option value="genbank">GENBANK (m)</option>
-      <option value="gff">GFF (m)</option>
-      <option value="hennig86">Hennig86 (m)</option>
-      <option value="ig">Intelligenetics (m)</option>
-      <option value="jackknifer">Jackknifer (m)</option>
-      <option value="jackknifernon">Jackknifernon (m)</option>
-      <option value="mega">Mega (m)</option>
-      <option value="meganon">Meganon (m)</option>
-      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
-      <option value="pir">NBRF (PIR) (m)</option>
-      <option value="ncbi">NCBI style FASTA (m)</option>
-      <option value="nexus">Nexus/PAUP (m)</option>
-      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
-      <option value="phylip">PHYLIP interleaved (m)</option>
-      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
-      <option value="selex">SELEX (m)</option>
-      <option value="staden">Staden (s)</option>
-      <option value="strider">DNA strider (m)</option>
-      <option value="swiss">SwisProt entry (m)</option>
-      <option value="text">Plain sequence (s)</option>
-      <option value="treecon">Treecon (m)</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="fasta" name="out_file1" />
+<tool id="EMBOSS: maskseq51" name="maskseq" version="5.0.0">
+  <description>Mask off regions of a sequence</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>maskseq -sequence '$input1' -outseq '$out_file1' -regions '$regions' -tolower $tolower -maskchar '$maskchar' -osformat2 $out_format1 -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="Sequence" />
+    <param name="regions" type="text" value="" label="Regions to mask (Example 1-99)" />
+    <param name="tolower" type="select" label="Mask by converting to lowercase">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="maskchar" type="text" value="N" label="Character to use when masking" />
+    <param name="out_format1" type="select" label="Output sequence file format">
+      <option value="fasta">FASTA (m)</option>
+      <option value="acedb">ACeDB (m)</option>
+      <option value="asn1">ASN.1 (m)</option>
+      <option value="clustal">Clustal (m)</option>
+      <option value="codata">CODATA (m)</option>
+      <option value="embl">EMBL (m)</option>
+      <option value="fitch">Fitch (m)</option>
+      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
+      <option value="genbank">GENBANK (m)</option>
+      <option value="gff">GFF (m)</option>
+      <option value="hennig86">Hennig86 (m)</option>
+      <option value="ig">Intelligenetics (m)</option>
+      <option value="jackknifer">Jackknifer (m)</option>
+      <option value="jackknifernon">Jackknifernon (m)</option>
+      <option value="mega">Mega (m)</option>
+      <option value="meganon">Meganon (m)</option>
+      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
+      <option value="pir">NBRF (PIR) (m)</option>
+      <option value="ncbi">NCBI style FASTA (m)</option>
+      <option value="nexus">Nexus/PAUP (m)</option>
+      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
+      <option value="phylip">PHYLIP interleaved (m)</option>
+      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
+      <option value="selex">SELEX (m)</option>
+      <option value="staden">Staden (s)</option>
+      <option value="strider">DNA strider (m)</option>
+      <option value="swiss">SwisProt entry (m)</option>
+      <option value="text">Plain sequence (s)</option>
+      <option value="treecon">Treecon (m)</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="fasta" />
   </outputs>
   <tests>
     <test>
@@ -62,19 +58,11 @@
       <param name="out_format1" value="fasta"/>
       <output name="out_file1" file="emboss_maskseq_out.fasta"/>
     </test>
-  </tests>
-  <code file="emboss_format_corrector.py" />
+  </tests>
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/maskseq.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/maskseq.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_matcher.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_matcher.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,41 +1,34 @@
-<tool id="EMBOSS: matcher52" name="matcher" version="5.0.0">
-  <description>Finds the best local alignments between two sequences</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>matcher -asequence $input1 -bsequence $input2 -outfile $out_file1 -alternatives $alternatives -gapopen $gapopen -gapextend $gapextend -aformat3 $out_format1 -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>Sequence 1</label>
-    </param>
-    <param format="data" name="input2" type="data">
-      <label>Sequence 2</label>
-    </param>
-    <param name="alternatives" type="text" value="1">
-      <label>Number of alternative matches</label>
-    </param>
-    <param name="gapopen" type="text" value="16">
-      <label>Gap penalty</label>
-    </param>
-    <param name="gapextend" type="text" value="4">
-      <label>Gap length (extension) penalty</label>
-    </param>
-    <param name="out_format1" type="select">
-      <label>Output Alignment File Format</label>
-      <option value="markx0">Markx0 (p)</option>
-      <option value="simple">Simple (m)</option>
-      <option value="fasta">FASTA (m)</option>
-      <option value="msf">MSF (m)</option>
-      <option value="srs">SRS (m)</option>
-      <option value="pair">Pair (p)</option>
-      <option value="markx1">Markx1 (p)</option>
-      <option value="markx2">Markx2 (p)</option>
-      <option value="markx3">Markx3 (p)</option>
-      <option value="markx10">Markx10 (p)</option>
-      <option value="srspair">SRS pair (p)</option>
-      <option value="score">Score (p)</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="markx0" name="out_file1" />
+<tool id="EMBOSS: matcher52" name="matcher" version="5.0.0.1">
+  <description>Finds the best local alignments between two sequences</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>matcher -asequence '$input1' -bsequence '$input2' -outfile '$out_file1' -alternatives $alternatives -gapopen $gapopen -gapextend $gapextend -aformat3 $out_format1 -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="Sequence 1" />
+    <param name="input2" type="data" format="data" label="Sequence 2" />
+    <param name="alternatives" type="integer" value="1" label="Number of alternative matches" />
+    <param name="gapopen" type="integer" value="16" label="Gap penalty" />
+    <param name="gapextend" type="integer" value="4" label="Gap length (extension) penalty" />
+    <param name="out_format1" type="select" label="Output alignment file format">
+      <option value="markx0">Markx0 (p)</option>
+      <option value="simple">Simple (m)</option>
+      <option value="fasta">FASTA (m)</option>
+      <option value="msf">MSF (m)</option>
+      <option value="srs">SRS (m)</option>
+      <option value="pair">Pair (p)</option>
+      <option value="markx1">Markx1 (p)</option>
+      <option value="markx2">Markx2 (p)</option>
+      <option value="markx3">Markx3 (p)</option>
+      <option value="markx10">Markx10 (p)</option>
+      <option value="srspair">SRS pair (p)</option>
+      <option value="score">Score (p)</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="markx0" />
   </outputs>
   <tests>
     <test>
@@ -47,19 +40,11 @@
       <param name="out_format1" value="fasta"/>
       <output name="out_file1" file="emboss_matcher_out.fasta"/>
     </test>
-  </tests>
-  <code file="emboss_format_corrector.py" />
+  </tests>
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/matcher.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/matcher.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_megamerger.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_megamerger.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,71 +1,59 @@
-<tool id="EMBOSS: megamerger53" name="megamerger" version="5.0.0">
-  <description>Merge two large overlapping nucleic acid sequences</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>megamerger -asequence $input1 -bsequence $input2 -outseq $out_file1 -outfile $out_file2 -wordsize $wordsize -prefer $prefer -osformat3 $out_format1 -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>Sequence 1</label>
-    </param>
-    <param format="data" name="input2" type="data">
-      <label>Sequence 2</label>
-    </param>
-    <param name="wordsize" type="text" value="20">
-      <label>Word size</label>
-    </param>
-    <param name="prefer" type="select">
-      <label>Prefer first sequence when mismatches occur</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="out_format1" type="select">
-      <label>Output Sequence File Format</label>
-      <option value="fasta">FASTA (m)</option>
-      <option value="acedb">ACeDB (m)</option>
-      <option value="asn1">ASN.1 (m)</option>
-      <option value="clustal">Clustal (m)</option>
-      <option value="codata">CODATA (m)</option>
-      <option value="embl">EMBL (m)</option>
-      <option value="fitch">Fitch (m)</option>
-      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
-      <option value="genbank">GENBANK (m)</option>
-      <option value="gff">GFF (m)</option>
-      <option value="hennig86">Hennig86 (m)</option>
-      <option value="ig">Intelligenetics (m)</option>
-      <option value="jackknifer">Jackknifer (m)</option>
-      <option value="jackknifernon">Jackknifernon (m)</option>
-      <option value="mega">Mega (m)</option>
-      <option value="meganon">Meganon (m)</option>
-      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
-      <option value="pir">NBRF (PIR) (m)</option>
-      <option value="ncbi">NCBI style FASTA (m)</option>
-      <option value="nexus">Nexus/PAUP (m)</option>
-      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
-      <option value="phylip">PHYLIP interleaved (m)</option>
-      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
-      <option value="selex">SELEX (m)</option>
-      <option value="staden">Staden (s)</option>
-      <option value="strider">DNA strider (m)</option>
-      <option value="swiss">SwisProt entry (m)</option>
-      <option value="text">Plain sequence (s)</option>
-      <option value="treecon">Treecon (m)</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="fasta" name="out_file1" />
-    <data format="txt" name="out_file2" />
-  </outputs>
-  <code file="emboss_format_corrector.py" />
+<tool id="EMBOSS: megamerger53" name="megamerger" version="5.0.0.1">
+  <description>Merge two large overlapping nucleic acid sequences</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>megamerger -asequence '$input1' -bsequence '$input2' -outseq '$out_file1' -outfile '$out_file2' -wordsize $wordsize -prefer $prefer -osformat3 $out_format1 -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="Sequence 1" />
+    <param name="input2" type="data" format="data" label="Sequence 2" />
+    <param name="wordsize" type="integer" value="20" label="Word size" />
+    <param name="prefer" type="select" label="Prefer first sequence when mismatches occur">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="out_format1" type="select" label="Output sequence file format">
+      <option value="fasta">FASTA (m)</option>
+      <option value="acedb">ACeDB (m)</option>
+      <option value="asn1">ASN.1 (m)</option>
+      <option value="clustal">Clustal (m)</option>
+      <option value="codata">CODATA (m)</option>
+      <option value="embl">EMBL (m)</option>
+      <option value="fitch">Fitch (m)</option>
+      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
+      <option value="genbank">GENBANK (m)</option>
+      <option value="gff">GFF (m)</option>
+      <option value="hennig86">Hennig86 (m)</option>
+      <option value="ig">Intelligenetics (m)</option>
+      <option value="jackknifer">Jackknifer (m)</option>
+      <option value="jackknifernon">Jackknifernon (m)</option>
+      <option value="mega">Mega (m)</option>
+      <option value="meganon">Meganon (m)</option>
+      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
+      <option value="pir">NBRF (PIR) (m)</option>
+      <option value="ncbi">NCBI style FASTA (m)</option>
+      <option value="nexus">Nexus/PAUP (m)</option>
+      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
+      <option value="phylip">PHYLIP interleaved (m)</option>
+      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
+      <option value="selex">SELEX (m)</option>
+      <option value="staden">Staden (s)</option>
+      <option value="strider">DNA strider (m)</option>
+      <option value="swiss">SwisProt entry (m)</option>
+      <option value="text">Plain sequence (s)</option>
+      <option value="treecon">Treecon (m)</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="fasta" />
+    <data name="out_file2" format="txt" />
+  </outputs>
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/megamerger.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/megamerger.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_merger.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_merger.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,84 +1,70 @@
-<tool id="EMBOSS: merger54" name="merger" version="5.0.0">
-  <description>Merge two overlapping nucleic acid sequences</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>merger -asequence $input1 -bsequence $input2 -outseq $out_file1 -outfile $out_file2 -gapopen $gapopen -gapextend $gapextend -osformat4 $out_format1 -aformat3 $out_format2 -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>Sequence 1</label>
-    </param>
-    <param format="data" name="input2" type="data">
-      <label>Sequence 2</label>
-    </param>
-    <param name="gapopen" type="text" value="50.0">
-      <label>Gap opening penalty</label>
-    </param>
-    <param name="gapextend" type="text" value="5.0">
-      <label>Gap extension penalty</label>
-    </param>
-    <param name="out_format1" type="select">
-      <label>Output Sequence File Format</label>
-      <option value="fasta">FASTA (m)</option>
-      <option value="acedb">ACeDB (m)</option>
-      <option value="asn1">ASN.1 (m)</option>
-      <option value="clustal">Clustal (m)</option>
-      <option value="codata">CODATA (m)</option>
-      <option value="embl">EMBL (m)</option>
-      <option value="fitch">Fitch (m)</option>
-      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
-      <option value="genbank">GENBANK (m)</option>
-      <option value="gff">GFF (m)</option>
-      <option value="hennig86">Hennig86 (m)</option>
-      <option value="ig">Intelligenetics (m)</option>
-      <option value="jackknifer">Jackknifer (m)</option>
-      <option value="jackknifernon">Jackknifernon (m)</option>
-      <option value="mega">Mega (m)</option>
-      <option value="meganon">Meganon (m)</option>
-      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
-      <option value="pir">NBRF (PIR) (m)</option>
-      <option value="ncbi">NCBI style FASTA (m)</option>
-      <option value="nexus">Nexus/PAUP (m)</option>
-      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
-      <option value="phylip">PHYLIP interleaved (m)</option>
-      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
-      <option value="selex">SELEX (m)</option>
-      <option value="staden">Staden (s)</option>
-      <option value="strider">DNA strider (m)</option>
-      <option value="swiss">SwisProt entry (m)</option>
-      <option value="text">Plain sequence (s)</option>
-      <option value="treecon">Treecon (m)</option>
-    </param>
-    <param name="out_format2" type="select">
-      <label>Output Alignment File Format</label>
-      <option value="simple">Simple (m)</option>
-      <option value="fasta">FASTA (m)</option>
-      <option value="msf">MSF (m)</option>
-      <option value="srs">SRS (m)</option>
-      <option value="pair">Pair (p)</option>
-      <option value="markx0">Markx0 (p)</option>
-      <option value="markx1">Markx1 (p)</option>
-      <option value="markx2">Markx2 (p)</option>
-      <option value="markx3">Markx3 (p)</option>
-      <option value="markx10">Markx10 (p)</option>
-      <option value="srspair">SRS pair (p)</option>
-      <option value="score">Score (p)</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="fasta" name="out_file1" />
-    <data format="simple" name="out_file2" />
-  </outputs>
-  <code file="emboss_format_corrector.py" />
+<tool id="EMBOSS: merger54" name="merger" version="5.0.0.1">
+  <description>Merge two overlapping nucleic acid sequences</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>merger -asequence '$input1' -bsequence '$input2' -outseq '$out_file1' -outfile '$out_file2' -gapopen $gapopen -gapextend $gapextend -osformat4 $out_format1 -aformat3 $out_format2 -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="Sequence 1" />
+    <param name="input2" type="data" format="data" label="Sequence 2" />
+    <param name="gapopen" type="float" value="50.0" label="Gap opening penalty" />
+    <param name="gapextend" type="float" value="5.0" label="Gap extension penalty" />
+    <param name="out_format1" type="select" label="Output sequence file format">
+      <option value="fasta">FASTA (m)</option>
+      <option value="acedb">ACeDB (m)</option>
+      <option value="asn1">ASN.1 (m)</option>
+      <option value="clustal">Clustal (m)</option>
+      <option value="codata">CODATA (m)</option>
+      <option value="embl">EMBL (m)</option>
+      <option value="fitch">Fitch (m)</option>
+      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
+      <option value="genbank">GENBANK (m)</option>
+      <option value="gff">GFF (m)</option>
+      <option value="hennig86">Hennig86 (m)</option>
+      <option value="ig">Intelligenetics (m)</option>
+      <option value="jackknifer">Jackknifer (m)</option>
+      <option value="jackknifernon">Jackknifernon (m)</option>
+      <option value="mega">Mega (m)</option>
+      <option value="meganon">Meganon (m)</option>
+      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
+      <option value="pir">NBRF (PIR) (m)</option>
+      <option value="ncbi">NCBI style FASTA (m)</option>
+      <option value="nexus">Nexus/PAUP (m)</option>
+      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
+      <option value="phylip">PHYLIP interleaved (m)</option>
+      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
+      <option value="selex">SELEX (m)</option>
+      <option value="staden">Staden (s)</option>
+      <option value="strider">DNA strider (m)</option>
+      <option value="swiss">SwisProt entry (m)</option>
+      <option value="text">Plain sequence (s)</option>
+      <option value="treecon">Treecon (m)</option>
+    </param>
+    <param name="out_format2" type="select" label="Output alignment file format">
+      <option value="simple">Simple (m)</option>
+      <option value="fasta">FASTA (m)</option>
+      <option value="msf">MSF (m)</option>
+      <option value="srs">SRS (m)</option>
+      <option value="pair">Pair (p)</option>
+      <option value="markx0">Markx0 (p)</option>
+      <option value="markx1">Markx1 (p)</option>
+      <option value="markx2">Markx2 (p)</option>
+      <option value="markx3">Markx3 (p)</option>
+      <option value="markx10">Markx10 (p)</option>
+      <option value="srspair">SRS pair (p)</option>
+      <option value="score">Score (p)</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="fasta" />
+    <data name="out_file2" format="simple" />
+  </outputs>
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/merger.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/merger.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_msbar.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_msbar.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,91 +1,82 @@
-<tool id="EMBOSS: msbar55" name="msbar" version="5.0.0">
-  <description>Mutate sequence beyond all recognition</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>msbar -sequence $input1 -outseq $out_file1 -count $count -point $point -block $block -codon $codon -inframe $inframe -minimum $minimum -maximum $maximum -osformat2 $out_format1
-  -auto</command>
-  <inputs>
-    <param format="fasta" name="input1" type="data">
-      <label>Sequence 1</label>
-    </param>
-    <param name="count" type="text" value="1">
-      <label>Number of times to perform the mutation operations</label>
-    </param>
-    <param name="point" type="select">
-      <label>Types of point mutations to perform</label>
-      <option value="0">None</option>
-      <option value="1">Any of the following</option>
-      <option value="2">Insertions</option>
-      <option value="3">Deletions</option>
-      <option value="4">Changes</option>
-      <option value="5">Duplications</option>
-      <option value="6">Moves</option>
-    </param>
-    <param name="block" type="select">
-      <label>Types of block mutations to perform</label>
-      <option value="0">None</option>
-      <option value="1">Any of the following</option>
-      <option value="2">Insertions</option>
-      <option value="3">Deletions</option>
-      <option value="4">Changes</option>
-      <option value="5">Duplications</option>
-      <option value="6">Moves</option>
-    </param>
-    <param name="codon" type="select">
-      <label>Types of codon mutations to perform. These are only done if the sequence is nucleic</label>
-      <option value="0">None</option>
-      <option value="1">Any of the following</option>
-      <option value="2">Insertions</option>
-      <option value="3">Deletions</option>
-      <option value="4">Changes</option>
-      <option value="5">Duplications</option>
-      <option value="6">Moves</option>
-    </param>
-    <param name="inframe" type="select">
-      <label>Do 'codon' and 'block' operations in frame</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="minimum" type="text" value="1">
-      <label>Minimum size for a block mutation</label>
-    </param>
-    <param name="maximum" type="text" value="10">
-      <label>Maximum size for a block mutation</label>
-    </param>
-    <param name="out_format1" type="select">
-      <label>Output Sequence File Format</label>
-      <option value="fasta">FASTA (m)</option>
-      <option value="acedb">ACeDB (m)</option>
-      <option value="asn1">ASN.1 (m)</option>
-      <option value="clustal">Clustal (m)</option>
-      <option value="codata">CODATA (m)</option>
-      <option value="embl">EMBL (m)</option>
-      <option value="fitch">Fitch (m)</option>
-      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
-      <option value="genbank">GENBANK (m)</option>
-      <option value="gff">GFF (m)</option>
-      <option value="hennig86">Hennig86 (m)</option>
-      <option value="ig">Intelligenetics (m)</option>
-      <option value="jackknifer">Jackknifer (m)</option>
-      <option value="jackknifernon">Jackknifernon (m)</option>
-      <option value="mega">Mega (m)</option>
-      <option value="meganon">Meganon (m)</option>
-      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
-      <option value="pir">NBRF (PIR) (m)</option>
-      <option value="ncbi">NCBI style FASTA (m)</option>
-      <option value="nexus">Nexus/PAUP (m)</option>
-      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
-      <option value="phylip">PHYLIP interleaved (m)</option>
-      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
-      <option value="selex">SELEX (m)</option>
-      <option value="staden">Staden (s)</option>
-      <option value="strider">DNA strider (m)</option>
-      <option value="swiss">SwisProt entry (m)</option>
-      <option value="text">Plain sequence (s)</option>
-      <option value="treecon">Treecon (m)</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="fasta" name="out_file1" />
+<tool id="EMBOSS: msbar55" name="msbar" version="5.0.0.1">
+  <description>Mutate sequence beyond all recognition</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>msbar -sequence '$input1' -outseq '$out_file1' -count $count -point $point -block $block -codon $codon -inframe $inframe -minimum $minimum -maximum $maximum -osformat2 $out_format1
+  -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="fasta" label="Sequence 1" />
+    <param name="count" type="integer" value="1" label="Number of times to perform the mutation operations" />
+    <param name="point" type="select" label="Types of point mutations to perform">
+      <option value="0">None</option>
+      <option value="1">Any of the following</option>
+      <option value="2">Insertions</option>
+      <option value="3">Deletions</option>
+      <option value="4">Changes</option>
+      <option value="5">Duplications</option>
+      <option value="6">Moves</option>
+    </param>
+    <param name="block" type="select" label="Types of block mutations to perform">
+      <option value="0">None</option>
+      <option value="1">Any of the following</option>
+      <option value="2">Insertions</option>
+      <option value="3">Deletions</option>
+      <option value="4">Changes</option>
+      <option value="5">Duplications</option>
+      <option value="6">Moves</option>
+    </param>
+    <param name="codon" type="select" label="Types of codon mutations to perform" help="These are only done if the sequence is nucleic">
+      <option value="0">None</option>
+      <option value="1">Any of the following</option>
+      <option value="2">Insertions</option>
+      <option value="3">Deletions</option>
+      <option value="4">Changes</option>
+      <option value="5">Duplications</option>
+      <option value="6">Moves</option>
+    </param>
+    <param name="inframe" type="select" label="Do 'codon' and 'block' operations in frame">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="minimum" type="integer" value="1" label="Minimum size for a block mutation" />
+    <param name="maximum" type="integer" value="10" label="Maximum size for a block mutation" />
+    <param name="out_format1" type="select" label="Output sequence file format">
+      <option value="fasta">FASTA (m)</option>
+      <option value="acedb">ACeDB (m)</option>
+      <option value="asn1">ASN.1 (m)</option>
+      <option value="clustal">Clustal (m)</option>
+      <option value="codata">CODATA (m)</option>
+      <option value="embl">EMBL (m)</option>
+      <option value="fitch">Fitch (m)</option>
+      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
+      <option value="genbank">GENBANK (m)</option>
+      <option value="gff">GFF (m)</option>
+      <option value="hennig86">Hennig86 (m)</option>
+      <option value="ig">Intelligenetics (m)</option>
+      <option value="jackknifer">Jackknifer (m)</option>
+      <option value="jackknifernon">Jackknifernon (m)</option>
+      <option value="mega">Mega (m)</option>
+      <option value="meganon">Meganon (m)</option>
+      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
+      <option value="pir">NBRF (PIR) (m)</option>
+      <option value="ncbi">NCBI style FASTA (m)</option>
+      <option value="nexus">Nexus/PAUP (m)</option>
+      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
+      <option value="phylip">PHYLIP interleaved (m)</option>
+      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
+      <option value="selex">SELEX (m)</option>
+      <option value="staden">Staden (s)</option>
+      <option value="strider">DNA strider (m)</option>
+      <option value="swiss">SwisProt entry (m)</option>
+      <option value="text">Plain sequence (s)</option>
+      <option value="treecon">Treecon (m)</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="fasta" />
   </outputs>
   <tests>
     <test>
@@ -100,10 +91,8 @@
       <param name="out_format1" value="fasta"/>
       <output name="out_file1" file="emboss_msbar_out.fasta"/>
     </test>
-  </tests>
-  <code file="emboss_format_corrector.py" />
+  </tests>
   <help>
-
 .. class:: warningmark
 
 The input dataset needs to be sequences.
@@ -111,15 +100,8 @@
 -----
 
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/msbar.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/msbar.html
   </help>
+  <expand macro="citations" />
 </tool>
--- a/emboss_needle.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_needle.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,43 +1,37 @@
-<tool id="EMBOSS: needle56" name="needle" version="5.0.0">
-  <description>Needleman-Wunsch global alignment</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>needle -asequence $input1 -bsequence $input2 -outfile $out_file1 -gapopen $gapopen -gapextend $gapextend -brief $brief -aformat3 $out_format1 -auto</command>
-  <inputs>
-    <param format="fasta" name="input1" type="data">
-      <label>Sequence 1</label>
-    </param>
-    <param format="fasta" name="input2" type="data">
-      <label>Sequence 2</label>
-    </param>
-    <param name="gapopen" type="text" value="10.0">
-      <label>Gap open penalty</label>
-    </param>
-    <param name="gapextend" type="text" value="0.5">
-      <label>Gap extension penalty</label>
-    </param>
-    <param name="brief" type="select">
-      <label>Brief identity and similarity</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="out_format1" type="select">
-      <label>Output Alignment File Format</label>
-      <option value="srspair">SRS pair (p)</option>
-      <option value="simple">Simple (m)</option>
-      <option value="fasta">FASTA (m)</option>
-      <option value="msf">MSF (m)</option>
-      <option value="srs">SRS (m)</option>
-      <option value="pair">Pair (p)</option>
-      <option value="markx0">Markx0 (p)</option>
-      <option value="markx1">Markx1 (p)</option>
-      <option value="markx2">Markx2 (p)</option>
-      <option value="markx3">Markx3 (p)</option>
-      <option value="markx10">Markx10 (p)</option>
+<tool id="EMBOSS: needle56" name="needle" version="5.0.0.1">
+  <description>Needleman-Wunsch global alignment</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>needle -asequence '$input1' -bsequence '$input2' -outfile '$out_file1' -gapopen $gapopen -gapextend $gapextend -brief $brief -aformat3 $out_format1 -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="fasta" label="Sequence 1" />
+    <param name="input2" type="data" format="fasta" label="Sequence 2" />
+    <param name="gapopen" type="float" value="10.0" label="Gap open penalty" />
+    <param name="gapextend" type="float" value="0.5" label="Gap extension penalty" />
+    <param name="brief" type="select" label="Brief identity and similarity">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="out_format1" type="select" label="Output alignment file format">
+      <option value="srspair">SRS pair (p)</option>
+      <option value="simple">Simple (m)</option>
+      <option value="fasta">FASTA (m)</option>
+      <option value="msf">MSF (m)</option>
+      <option value="srs">SRS (m)</option>
+      <option value="pair">Pair (p)</option>
+      <option value="markx0">Markx0 (p)</option>
+      <option value="markx1">Markx1 (p)</option>
+      <option value="markx2">Markx2 (p)</option>
+      <option value="markx3">Markx3 (p)</option>
+      <option value="markx10">Markx10 (p)</option>
       <option value="score">Score (p)</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="needle" name="out_file1" />
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="needle" />
   </outputs>
   <tests>
     <test>
@@ -49,10 +43,8 @@
       <param name="out_format1" value="score"/>
       <output name="out_file1" file="emboss_needle_out.score"/>
     </test>
-  </tests>
-  <code file="emboss_format_corrector.py" />
+  </tests>
   <help>
-
 .. class:: warningmark
 
 needle reads any two sequences of the same type (DNA or protein).
@@ -61,7 +53,7 @@
 
 **Syntax**
 
-This tool uses the Needleman-Wunsch global alignment algorithm to find the optimum alignment (including gaps) of two sequences when considering their entire length. 
+This tool uses the Needleman-Wunsch global alignment algorithm to find the optimum alignment (including gaps) of two sequences when considering their entire length.
 
 - **Optimal alignment:** Dynamic programming methods ensure the optimal global alignment by exploring all possible alignments and choosing the best.
 
@@ -72,8 +64,8 @@
 - **Gap extension penalty:** [0.5 for any sequence] The gap extension, penalty is added to the standard gap penalty for each base or residue in the gap. This is how long gaps are penalized. Usually you will expect a few long gaps rather than many short gaps, so the gap extension penalty should be lower than the gap penalty. An exception is where one or both sequences are single reads with possible sequencing errors in which case you would expect many single base gaps. You can get this result by setting the gap open penalty to zero (or very low) and using the gap extension penalty to control gap scoring. (Floating point number from 0.0 to 10.0)
 
 You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/needle.html
+
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/needle.html
 
 -----
 
@@ -85,7 +77,7 @@
     TTTATGTCTATAATCCTTACCAAAAGTTACCTTGGAATAAGAAGAAGTCA
     GTAAAAAGAAGGCTGTTGTTCCGTGAAATACTG
 
-- If both Sequence1 and Sequence2 take the above file as input, Gap open penalty equals 10.0, Gap extension penalty equals 0.5, Brief identity and similarity is set to Yes, Output Alignment File Format is set to SRS pairs, the output file is::
+- If both Sequence1 and Sequence2 take the above file as input, Gap open penalty equals 10.0, Gap extension penalty equals 0.5, Brief identity and similarity is set to Yes, Output alignment file format is set to SRS pairs, the output file is::
 
     ########################################
     # Program: needle
@@ -93,7 +85,7 @@
     # Align_format: srspair
     # Report_file: ./database/files/dataset_7.dat
     ########################################
-     
+
     #=======================================
     #
     # Aligned_sequences: 2
@@ -114,21 +106,13 @@
     hg18_dna           1 TTTATGTCTATAATCCTTACCAAAAGTTACCTTGGAATAAGAAGAAGTCA     50
                        ||||||||||||||||||||||||||||||||||||||||||||||||||
     hg18_dna           1 TTTATGTCTATAATCCTTACCAAAAGTTACCTTGGAATAAGAAGAAGTCA     50
-        
+
     hg18_dna          51 GTAAAAAGAAGGCTGTTGTTCCGTGAAATACTG     83
                        |||||||||||||||||||||||||||||||||
     hg18_dna          51 GTAAAAAGAAGGCTGTTGTTCCGTGAAATACTG     83
-        
+
     #---------------------------------------
     #---------------------------------------
-
-
-------
-
-**Citation**
-
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
   </help>
+  <expand macro="citations" />
 </tool>
--- a/emboss_newcpgreport.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_newcpgreport.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,29 +1,20 @@
-<tool id="EMBOSS: newcpgreport57" name="newcpgreport" version="5.0.0">
-  <description>Report CpG rich areas</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>newcpgreport -sequence $input1 -window $window -shift $shift -minlen $minlen -minpc $minpc -outfile $out_file1 -minoe $minoe -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>Sequence</label>
-    </param>
-    <param name="window" type="text" value="100">
-      <label>Window Size</label>
-    </param>
-    <param name="shift" type="text" value="1">
-      <label>Step size (shift)</label>
-    </param>
-    <param name="minlen" type="text" value="200">
-      <label>Minimum length</label>
-    </param>
-    <param name="minoe" type="text" value="0.6">
-      <label>Minimum average observed to expected ratio</label>
-    </param>
-    <param name="minpc" type="text" value="50.0">
-      <label>Minimum average percentage of G plus C</label>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="newcpgreport" name="out_file1" />
+<tool id="EMBOSS: newcpgreport57" name="newcpgreport" version="5.0.0.1">
+  <description>Report CpG rich areas</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <command>newcpgreport -sequence '$input1' -window $window -shift $shift -minlen $minlen -minpc $minpc -outfile '$out_file1' -minoe $minoe -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="Sequence" />
+    <param name="window" type="integer" value="100" label="Window size" />
+    <param name="shift" type="integer" value="1" label="Step size (shift)" />
+    <param name="minlen" type="integer" value="200" label="Minimum length" />
+    <param name="minoe" type="float" value="0.6" label="Minimum average observed to expected ratio" />
+    <param name="minpc" type="float" value="50.0" label="Minimum average percentage of G plus C" />
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="newcpgreport" />
   </outputs>
   <tests>
     <test>
@@ -35,18 +26,11 @@
       <param name="minpc" value="50.0"/>
       <output name="out_file1" file="emboss_newcpgreport_out.newcpgreport"/>
     </test>
-  </tests>
+  </tests>
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/newcpgreport.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/newcpgreport.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_newcpgseek.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_newcpgseek.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,17 +1,16 @@
-<tool id="EMBOSS: newcpgseek58" name="newcpgseek" version="5.0.0">
-  <description>Reports CpG rich region</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>newcpgseek -sequence $input1 -outfile $out_file1 -score $score -auto</command>
-  <inputs>
-    <param format="fasta" name="input1" type="data">
-      <label>Sequence</label>
-    </param>
-    <param name="score" type="text" value="17">
-      <label>CpG score</label>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="newcpgseek" name="out_file1" />
+<tool id="EMBOSS: newcpgseek58" name="newcpgseek" version="5.0.0.1">
+  <description>Reports CpG rich region</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <command>newcpgseek -sequence '$input1' -outfile '$out_file1' -score $score -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="fasta" label="Sequence" />
+    <param name="score" type="integer" value="17" label="CpG score" />
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="newcpgseek" />
   </outputs>
   <tests>
     <test>
@@ -19,9 +18,8 @@
       <param name="score" value="17"/>
       <output name="out_file1" file="emboss_newcpgseek_out.newcpgseek"/>
     </test>
-  </tests>
+  </tests>
   <help>
-
 .. class:: warningmark
 
 The input dataset needs to be sequences.
@@ -29,15 +27,8 @@
 -----
 
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/newcpgseek.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/newcpgseek.html
   </help>
+  <expand macro="citations" />
 </tool>
--- a/emboss_newseq.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_newseq.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,91 +1,79 @@
-<tool id="EMBOSS: newseq59" name="newseq" version="5.0.0">
-  <description>Type in a short new sequence</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>
-  <![CDATA[
-    newseq
-      -outseq '$out_file1'
-      -name '$seqname'
-      -description '$description'
-      -type '$type' 
-      -sequence '$sequence'
-      -osformat5 '$out_format1'
-      -auto
-  ]]>
-  </command>
-  <inputs>
-    <param name="seqname" type="text" value="">
-      <label>Name of of the sequence</label>
-    </param>
-    <param name="description" type="text" value="">
-      <label>Description of the sequence</label>
-    </param>
-    <param name="type" type="select">
-      <label>Type of sequence</label>
-      <option value="N">Nucleic</option>
-      <option value="P">Protein</option>
-    </param>
-    <param name="sequence" type="text" value="">
-      <label>The sequence itself</label>
-    </param>
-    <param name="out_format1" type="select">
-      <label>Output Sequence File Format</label>
-      <option value="fasta">FASTA (m)</option>
-      <option value="acedb">ACeDB (m)</option>
-      <option value="asn1">ASN.1 (m)</option>
-      <option value="clustal">Clustal (m)</option>
-      <option value="codata">CODATA (m)</option>
-      <option value="embl">EMBL (m)</option>
-      <option value="fitch">Fitch (m)</option>
-      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
-      <option value="genbank">GENBANK (m)</option>
-      <option value="gff">GFF (m)</option>
-      <option value="hennig86">Hennig86 (m)</option>
-      <option value="ig">Intelligenetics (m)</option>
-      <option value="jackknifer">Jackknifer (m)</option>
-      <option value="jackknifernon">Jackknifernon (m)</option>
-      <option value="mega">Mega (m)</option>
-      <option value="meganon">Meganon (m)</option>
-      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
-      <option value="pir">NBRF (PIR) (m)</option>
-      <option value="ncbi">NCBI style FASTA (m)</option>
-      <option value="nexus">Nexus/PAUP (m)</option>
-      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
-      <option value="phylip">PHYLIP interleaved (m)</option>
-      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
-      <option value="selex">SELEX (m)</option>
-      <option value="staden">Staden (s)</option>
-      <option value="strider">DNA strider (m)</option>
-      <option value="swiss">SwisProt entry (m)</option>
-      <option value="text">Plain sequence (s)</option>
-      <option value="treecon">Treecon (m)</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="fasta" name="out_file1" />
-  </outputs>
-  <tests>
-    <test>
-      <param name="seqname" value="cytoc"/>
-      <param name="description" value="fragment_of_cytochrome_c"/>
-      <param name="type" value="N"/>
-      <param name="sequence" value="KKKEERADLIAY"/>
-      <param name="out_format1" value="fasta"/>
-      <output name="out_file1" file="emboss_newseq_out.fasta"/>
-    </test>
-  </tests>
-  <code file="emboss_format_corrector.py" />
-  <help>
-    You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/newseq.html
-
-------
-
-**Citation**
-
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
-  </help>
-</tool>
+<tool id="EMBOSS: newseq59" name="newseq" version="5.0.0">
+  <description>Type in a short new sequence</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>
+  <![CDATA[
+    newseq
+      -outseq '$out_file1'
+      -name '$seqname'
+      -description '$description'
+      -type $type
+      -sequence '$sequence'
+      -osformat5 $out_format1
+      -auto
+  ]]>
+  </command>
+  <inputs>
+    <param name="seqname" type="text" value="" label="Name of of the sequence" />
+    <param name="description" type="text" value="" label="Description of the sequence" />
+    <param name="type" type="select" label="Type of sequence">
+      <option value="N">Nucleic</option>
+      <option value="P">Protein</option>
+    </param>
+    <param name="sequence" type="text" value="" label="The sequence itself" />
+    <param name="out_format1" type="select" label="Output sequence file format">
+      <option value="fasta">FASTA (m)</option>
+      <option value="acedb">ACeDB (m)</option>
+      <option value="asn1">ASN.1 (m)</option>
+      <option value="clustal">Clustal (m)</option>
+      <option value="codata">CODATA (m)</option>
+      <option value="embl">EMBL (m)</option>
+      <option value="fitch">Fitch (m)</option>
+      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
+      <option value="genbank">GENBANK (m)</option>
+      <option value="gff">GFF (m)</option>
+      <option value="hennig86">Hennig86 (m)</option>
+      <option value="ig">Intelligenetics (m)</option>
+      <option value="jackknifer">Jackknifer (m)</option>
+      <option value="jackknifernon">Jackknifernon (m)</option>
+      <option value="mega">Mega (m)</option>
+      <option value="meganon">Meganon (m)</option>
+      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
+      <option value="pir">NBRF (PIR) (m)</option>
+      <option value="ncbi">NCBI style FASTA (m)</option>
+      <option value="nexus">Nexus/PAUP (m)</option>
+      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
+      <option value="phylip">PHYLIP interleaved (m)</option>
+      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
+      <option value="selex">SELEX (m)</option>
+      <option value="staden">Staden (s)</option>
+      <option value="strider">DNA strider (m)</option>
+      <option value="swiss">SwisProt entry (m)</option>
+      <option value="text">Plain sequence (s)</option>
+      <option value="treecon">Treecon (m)</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="fasta" />
+  </outputs>
+  <tests>
+    <test>
+      <param name="seqname" value="cytoc"/>
+      <param name="description" value="fragment_of_cytochrome_c"/>
+      <param name="type" value="N"/>
+      <param name="sequence" value="KKKEERADLIAY"/>
+      <param name="out_format1" value="fasta"/>
+      <output name="out_file1" file="emboss_newseq_out.fasta"/>
+    </test>
+  </tests>
+  <help>
+    You can view the original documentation here_.
+
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/newseq.html
+  </help>
+  <expand macro="citations" />
+</tool>
--- a/emboss_noreturn.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_noreturn.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,20 +1,20 @@
-<tool id="EMBOSS: noreturn60" name="noreturn" version="5.0.0">
-  <description>Removes carriage return from ASCII files</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>noreturn -infile $input1 -outfile $out_file1 -system $system -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>On query</label>
-    </param>
-    <param name="system" type="select">
-      <label>Target operating system for end-of-line format</label>
-      <option value="unix">Unix/Linux systems</option>
-      <option value="pc">Windows/DOS</option>
-      <option value="mac">Apple Macintosh</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="noreturn" name="out_file1" />
+<tool id="EMBOSS: noreturn60" name="noreturn" version="5.0.0">
+  <description>Removes carriage return from ASCII files</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <command>noreturn -infile '$input1' -outfile '$out_file1' -system $system -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="On query" />
+    <param name="system" type="select" label="Target operating system for end-of-line format">
+      <option value="unix">Unix/Linux systems</option>
+      <option value="pc">Windows/DOS</option>
+      <option value="mac">Apple Macintosh</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="noreturn" />
   </outputs>
   <tests>
     <test>
@@ -22,18 +22,11 @@
       <param name="system" value="unix"/>
       <output name="out_file1" file="emboss_noreturn_out.noreturn"/>
     </test>
-  </tests>
+  </tests>
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/noreturn.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/noreturn.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_notseq.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_notseq.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,49 +1,48 @@
-<tool id="EMBOSS: notseq61" name="notseq" version="5.0.0">
-  <description>Exclude a set of sequences and write out the remaining ones</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>notseq -sequence $input1 -outseq $out_file1 -exclude "$exclude" -osformat3 $out_format1 -auto</command>
-  <inputs>
-    <param format="fasta" name="input1" type="data">
-      <label>On query</label>
-    </param>
-    <param name="exclude" type="text" value="">
-      <label>Exclude list</label>
-    </param>
-    <param name="out_format1" type="select">
-      <label>Output Sequence File Format</label>
-      <option value="fasta">FASTA (m)</option>
-      <option value="acedb">ACeDB (m)</option>
-      <option value="asn1">ASN.1 (m)</option>
-      <option value="clustal">Clustal (m)</option>
-      <option value="codata">CODATA (m)</option>
-      <option value="embl">EMBL (m)</option>
-      <option value="fitch">Fitch (m)</option>
-      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
-      <option value="genbank">GENBANK (m)</option>
-      <option value="gff">GFF (m)</option>
-      <option value="hennig86">Hennig86 (m)</option>
-      <option value="ig">Intelligenetics (m)</option>
-      <option value="jackknifer">Jackknifer (m)</option>
-      <option value="jackknifernon">Jackknifernon (m)</option>
-      <option value="mega">Mega (m)</option>
-      <option value="meganon">Meganon (m)</option>
-      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
-      <option value="pir">NBRF (PIR) (m)</option>
-      <option value="ncbi">NCBI style FASTA (m)</option>
-      <option value="nexus">Nexus/PAUP (m)</option>
-      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
-      <option value="phylip">PHYLIP interleaved (m)</option>
-      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
-      <option value="selex">SELEX (m)</option>
-      <option value="staden">Staden (s)</option>
-      <option value="strider">DNA strider (m)</option>
-      <option value="swiss">SwisProt entry (m)</option>
-      <option value="text">Plain sequence (s)</option>
-      <option value="treecon">Treecon (m)</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="fasta" name="out_file1" />
+<tool id="EMBOSS: notseq61" name="notseq" version="5.0.0">
+  <description>Exclude a set of sequences and write out the remaining ones</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>notseq -sequence '$input1' -outseq '$out_file1' -exclude '$exclude' -osformat3 $out_format1 -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="fasta" label="On query" />
+    <param name="exclude" type="text" value="" label="Exclude list" />
+    <param name="out_format1" type="select" label="Output sequence file format">
+      <option value="fasta">FASTA (m)</option>
+      <option value="acedb">ACeDB (m)</option>
+      <option value="asn1">ASN.1 (m)</option>
+      <option value="clustal">Clustal (m)</option>
+      <option value="codata">CODATA (m)</option>
+      <option value="embl">EMBL (m)</option>
+      <option value="fitch">Fitch (m)</option>
+      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
+      <option value="genbank">GENBANK (m)</option>
+      <option value="gff">GFF (m)</option>
+      <option value="hennig86">Hennig86 (m)</option>
+      <option value="ig">Intelligenetics (m)</option>
+      <option value="jackknifer">Jackknifer (m)</option>
+      <option value="jackknifernon">Jackknifernon (m)</option>
+      <option value="mega">Mega (m)</option>
+      <option value="meganon">Meganon (m)</option>
+      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
+      <option value="pir">NBRF (PIR) (m)</option>
+      <option value="ncbi">NCBI style FASTA (m)</option>
+      <option value="nexus">Nexus/PAUP (m)</option>
+      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
+      <option value="phylip">PHYLIP interleaved (m)</option>
+      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
+      <option value="selex">SELEX (m)</option>
+      <option value="staden">Staden (s)</option>
+      <option value="strider">DNA strider (m)</option>
+      <option value="swiss">SwisProt entry (m)</option>
+      <option value="text">Plain sequence (s)</option>
+      <option value="treecon">Treecon (m)</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="fasta" />
   </outputs>
   <tests>
     <test>
@@ -52,10 +51,8 @@
       <param name="out_format1" value="fasta"/>
       <output name="out_file1" file="emboss_notseq_out.fasta"/>
     </test>
-  </tests>
-  <code file="emboss_format_corrector.py" />
+  </tests>
   <help>
-
 .. class:: warningmark
 
 The input dataset needs to be sequences.
@@ -63,15 +60,8 @@
 -----
 
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/notseq.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/notseq.html
   </help>
+  <expand macro="citations" />
 </tool>
--- a/emboss_nthseq.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_nthseq.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,49 +1,48 @@
-<tool id="EMBOSS: nthseq62" name="nthseq" version="5.0.0">
-  <description>Writes one sequence from a multiple set of sequences</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>nthseq -sequence $input1 -outseq $out_file1 -number $number -osformat2 $out_format1 -auto</command>
-  <inputs>
-    <param format="fasta" name="input1" type="data">
-      <label>Sequences</label>
-    </param>
-    <param name="number" type="text" value="1">
-      <label>Number of the sequence to output</label>
-    </param>
-    <param name="out_format1" type="select">
-      <label>Output Sequence File Format</label>
-      <option value="fasta">FASTA (m)</option>
-      <option value="acedb">ACeDB (m)</option>
-      <option value="asn1">ASN.1 (m)</option>
-      <option value="clustal">Clustal (m)</option>
-      <option value="codata">CODATA (m)</option>
-      <option value="embl">EMBL (m)</option>
-      <option value="fitch">Fitch (m)</option>
-      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
-      <option value="genbank">GENBANK (m)</option>
-      <option value="gff">GFF (m)</option>
-      <option value="hennig86">Hennig86 (m)</option>
-      <option value="ig">Intelligenetics (m)</option>
-      <option value="jackknifer">Jackknifer (m)</option>
-      <option value="jackknifernon">Jackknifernon (m)</option>
-      <option value="mega">Mega (m)</option>
-      <option value="meganon">Meganon (m)</option>
-      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
-      <option value="pir">NBRF (PIR) (m)</option>
-      <option value="ncbi">NCBI style FASTA (m)</option>
-      <option value="nexus">Nexus/PAUP (m)</option>
-      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
-      <option value="phylip">PHYLIP interleaved (m)</option>
-      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
-      <option value="selex">SELEX (m)</option>
-      <option value="staden">Staden (s)</option>
-      <option value="strider">DNA strider (m)</option>
-      <option value="swiss">SwisProt entry (m)</option>
-      <option value="text">Plain sequence (s)</option>
-      <option value="treecon">Treecon (m)</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="fasta" name="out_file1" />
+<tool id="EMBOSS: nthseq62" name="nthseq" version="5.0.0.1">
+  <description>Writes one sequence from a multiple set of sequences</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>nthseq -sequence '$input1' -outseq '$out_file1' -number $number -osformat2 $out_format1 -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="fasta" label="Sequences" />
+    <param name="number" type="integer" value="1" label="Number of the sequence to output" />
+    <param name="out_format1" type="select" label="Output sequence file format">
+      <option value="fasta">FASTA (m)</option>
+      <option value="acedb">ACeDB (m)</option>
+      <option value="asn1">ASN.1 (m)</option>
+      <option value="clustal">Clustal (m)</option>
+      <option value="codata">CODATA (m)</option>
+      <option value="embl">EMBL (m)</option>
+      <option value="fitch">Fitch (m)</option>
+      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
+      <option value="genbank">GENBANK (m)</option>
+      <option value="gff">GFF (m)</option>
+      <option value="hennig86">Hennig86 (m)</option>
+      <option value="ig">Intelligenetics (m)</option>
+      <option value="jackknifer">Jackknifer (m)</option>
+      <option value="jackknifernon">Jackknifernon (m)</option>
+      <option value="mega">Mega (m)</option>
+      <option value="meganon">Meganon (m)</option>
+      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
+      <option value="pir">NBRF (PIR) (m)</option>
+      <option value="ncbi">NCBI style FASTA (m)</option>
+      <option value="nexus">Nexus/PAUP (m)</option>
+      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
+      <option value="phylip">PHYLIP interleaved (m)</option>
+      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
+      <option value="selex">SELEX (m)</option>
+      <option value="staden">Staden (s)</option>
+      <option value="strider">DNA strider (m)</option>
+      <option value="swiss">SwisProt entry (m)</option>
+      <option value="text">Plain sequence (s)</option>
+      <option value="treecon">Treecon (m)</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="fasta" />
   </outputs>
   <tests>
     <test>
@@ -52,10 +51,8 @@
       <param name="out_format1" value="fasta"/>
       <output name="out_file1" file="emboss_nthseq_out.fasta"/>
     </test>
-  </tests>
-  <code file="emboss_format_corrector.py" />
+  </tests>
   <help>
-
 .. class:: warningmark
 
 The input dataset needs to be sequences.
@@ -63,15 +60,8 @@
 -----
 
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/nthseq.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/nthseq.html
   </help>
+  <expand macro="citations" />
 </tool>
--- a/emboss_octanol.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_octanol.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,46 +1,35 @@
-<tool id="EMBOSS: octanol63" name="octanol" version="5.0.0">
-  <!-- graphics output with filename, no functional tests added -->  
-  <description>Displays protein hydropathy</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command interpreter="perl">emboss_single_outputfile_wrapper.pl octanol -sequence $input1 -graph png -goutfile $out_file1 -width $width -octanolplot $octanolplot -interfaceplot $interfaceplot
-  -differenceplot $differenceplot -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>Sequences</label>
-    </param>
-    <param name="width" type="text" value="19">
-      <label>Window size</label>
-    </param>
-    <param name="octanolplot" type="select">
-      <label>Display the octanol plot</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="interfaceplot" type="select">
-      <label>Display the interface plot</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="differenceplot" type="select">
-      <label>Display the difference plot</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="png" name="out_file1" />
-  </outputs>
+<tool id="EMBOSS: octanol63" name="octanol" version="5.0.0.1">
+  <!-- graphics output with filename, no functional tests added -->
+  <description>Displays protein hydropathy</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <command>perl '$__tool_directory__/emboss_single_outputfile_wrapper.pl' octanol -sequence '$input1' -graph png -goutfile '$out_file1' -width $width -octanolplot $octanolplot -interfaceplot $interfaceplot
+  -differenceplot $differenceplot -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="Sequences" />
+    <param name="width" type="integer" value="19" label="Window size" />
+    <param name="octanolplot" type="select" label="Display the octanol plot">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="interfaceplot" type="select" label="Display the interface plot">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="differenceplot" type="select" label="Display the difference plot">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="png" />
+  </outputs>
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/octanol.html
 
-------
-
-**Citation**
-
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/octanol.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_oddcomp.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_oddcomp.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,27 +1,22 @@
-<tool id="EMBOSS: oddcomp64" name="oddcomp" version="5.0.0">
+<tool id="EMBOSS: oddcomp64" name="oddcomp" version="5.0.0.1">
   <!-- output contains file location info, commented out functional tests -->
-  <description>Find protein sequence regions with a biased composition</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>oddcomp -sequence $input1 -infile $input2 -outfile $out_file1 -window $window -ignorebz $ignorebz -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>Sequences</label>
-    </param>
-    <param format="data" name="input2" type="data">
-      <label>This is a file in the format of the output produced by 'compseq' that is used to set the minimum frequencies of words in this analysis</label>
-    </param>
-    <param name="window" type="text" value="30">
-      <label>This is the size of window in which to count. Thus if you want to count frequencies in a 40 aa stretch you should enter 40 here</label>
-    </param>
-    <param name="ignorebz" type="select">
-      <label>The amino acid code B represents Asparagine or Aspartic acid and the code Z represents Glutamine or Glutamic acid. These are not commonly used codes and you may wish not to count words
-      containing them, just noting them in the count of 'Other' words</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="oddcomp" name="out_file1" />
+  <description>Find protein sequence regions with a biased composition</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <command>oddcomp -sequence '$input1' -infile '$input2' -outfile '$out_file1' -window $window -ignorebz $ignorebz -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="Sequences" />
+    <param name="input2" type="data" format="data" label="Dataset in the format of the output produced by 'compseq' that is used to set the minimum frequencies of words in this analysis" />
+    <param name="window" type="integer" value="30" label="Size of window in which to count" help="If you want to count frequencies in a 40 aa stretch you should enter 40 here" />
+    <param name="ignorebz" type="select" label="Ignore B and Z" help="The amino acid code B represents Asparagine or Aspartic acid and the code Z represents Glutamine or Glutamic acid. These are not commonly used codes and you may wish not to count words containing them, just noting them in the count of 'Other' words">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="oddcomp" />
   </outputs>
 <!--    <tests>
     <test>
@@ -31,18 +26,11 @@
       <param name="ignorebz" value="yes"/>
       <output name="out_file1" file="emboss_oddcomp_out.oddcomp"/>
     </test>
-  </tests> -->
+  </tests> -->
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/oddcomp.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/oddcomp.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_palindrome.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_palindrome.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,31 +1,23 @@
-<tool id="EMBOSS: palindrome65" name="palindrome" version="5.0.0">
-  <description>Looks for inverted repeats in a nucleotide sequence</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>palindrome -sequence $input1 -outfile $out_file1 -minpallen $minpallen -maxpallen $maxpallen -gaplimit $gaplimit -nummismatches $nummismatches -overlap $overlap -auto</command>
-  <inputs>
-    <param format="fasta" name="input1" type="data">
-      <label>Sequences</label>
-    </param>
-    <param name="minpallen" type="text" value="10">
-      <label>Minimum length of palindrome</label>
-    </param>
-    <param name="maxpallen" type="text" value="100">
-      <label>Maximum length of palindrome</label>
-    </param>
-    <param name="gaplimit" type="text" value="100">
-      <label>Maximum gap between repeated regions</label>
-    </param>
-    <param name="nummismatches" type="text" value="0">
-      <label>Number of mismatches allowed</label>
-    </param>
-    <param name="overlap" type="select">
-      <label>Report overlapping matches</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="palindrome" name="out_file1" />
+<tool id="EMBOSS: palindrome65" name="palindrome" version="5.0.0.1">
+  <description>Looks for inverted repeats in a nucleotide sequence</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <command>palindrome -sequence '$input1' -outfile '$out_file1' -minpallen $minpallen -maxpallen $maxpallen -gaplimit $gaplimit -nummismatches $nummismatches -overlap $overlap -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="fasta" label="Sequences" />
+    <param name="minpallen" type="integer" value="10" label="Minimum length of palindrome" />
+    <param name="maxpallen" type="integer" value="100" label="Maximum length of palindrome" />
+    <param name="gaplimit" type="integer" value="100" label="Maximum gap between repeated regions" />
+    <param name="nummismatches" type="integer" value="0" label="Number of mismatches allowed" />
+    <param name="overlap" type="select" label="Report overlapping matches">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="palindrome" />
   </outputs>
   <tests>
     <test>
@@ -37,9 +29,8 @@
       <param name="overlap" value="yes"/>
       <output name="out_file1" file="emboss_palindrome_out.palindrome"/>
     </test>
-  </tests>
+  </tests>
   <help>
-
 .. class:: warningmark
 
 The input dataset needs to be sequences.
@@ -47,15 +38,8 @@
 -----
 
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/palindrome.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/palindrome.html
   </help>
+  <expand macro="citations" />
 </tool>
--- a/emboss_pasteseq.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_pasteseq.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,52 +1,49 @@
-<tool id="EMBOSS: pasteseq66" name="pasteseq" version="5.0.0">
-  <description>Insert one sequence into another</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>pasteseq -asequence $input2 -bsequence $input1 -outseq $out_file1 -pos $pos -osformat3 $out_format1 -auto</command>
-  <inputs>
-    <param format="fasta" name="input1" type="data">
-      <label>Main sequence</label>
-    </param>
-    <param format="fasta" name="input2" type="data">
-      <label>Sequence to insert</label>
-    </param>
-    <param name="pos" type="text" value="0">
-      <label>Position to insert after</label>
-    </param>
-    <param name="out_format1" type="select">
-      <label>Output Sequence File Format</label>
-      <option value="fasta">FASTA (m)</option>
-      <option value="acedb">ACeDB (m)</option>
-      <option value="asn1">ASN.1 (m)</option>
-      <option value="clustal">Clustal (m)</option>
-      <option value="codata">CODATA (m)</option>
-      <option value="embl">EMBL (m)</option>
-      <option value="fitch">Fitch (m)</option>
-      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
-      <option value="genbank">GENBANK (m)</option>
-      <option value="gff">GFF (m)</option>
-      <option value="hennig86">Hennig86 (m)</option>
-      <option value="ig">Intelligenetics (m)</option>
-      <option value="jackknifer">Jackknifer (m)</option>
-      <option value="jackknifernon">Jackknifernon (m)</option>
-      <option value="mega">Mega (m)</option>
-      <option value="meganon">Meganon (m)</option>
-      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
-      <option value="pir">NBRF (PIR) (m)</option>
-      <option value="ncbi">NCBI style FASTA (m)</option>
-      <option value="nexus">Nexus/PAUP (m)</option>
-      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
-      <option value="phylip">PHYLIP interleaved (m)</option>
-      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
-      <option value="selex">SELEX (m)</option>
-      <option value="staden">Staden (s)</option>
-      <option value="strider">DNA strider (m)</option>
-      <option value="swiss">SwisProt entry (m)</option>
-      <option value="text">Plain sequence (s)</option>
-      <option value="treecon">Treecon (m)</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="fasta" name="out_file1" />
+<tool id="EMBOSS: pasteseq66" name="pasteseq" version="5.0.0.1">
+  <description>Insert one sequence into another</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>pasteseq -asequence '$input2' -bsequence '$input1' -outseq '$out_file1' -pos $pos -osformat3 $out_format1 -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="fasta" label="Main sequence" />
+    <param name="input2" type="data" format="fasta" label="Sequence to insert" />
+    <param name="pos" type="integer" value="0" label="Position to insert after" />
+    <param name="out_format1" type="select" label="Output sequence file format">
+      <option value="fasta">FASTA (m)</option>
+      <option value="acedb">ACeDB (m)</option>
+      <option value="asn1">ASN.1 (m)</option>
+      <option value="clustal">Clustal (m)</option>
+      <option value="codata">CODATA (m)</option>
+      <option value="embl">EMBL (m)</option>
+      <option value="fitch">Fitch (m)</option>
+      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
+      <option value="genbank">GENBANK (m)</option>
+      <option value="gff">GFF (m)</option>
+      <option value="hennig86">Hennig86 (m)</option>
+      <option value="ig">Intelligenetics (m)</option>
+      <option value="jackknifer">Jackknifer (m)</option>
+      <option value="jackknifernon">Jackknifernon (m)</option>
+      <option value="mega">Mega (m)</option>
+      <option value="meganon">Meganon (m)</option>
+      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
+      <option value="pir">NBRF (PIR) (m)</option>
+      <option value="ncbi">NCBI style FASTA (m)</option>
+      <option value="nexus">Nexus/PAUP (m)</option>
+      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
+      <option value="phylip">PHYLIP interleaved (m)</option>
+      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
+      <option value="selex">SELEX (m)</option>
+      <option value="staden">Staden (s)</option>
+      <option value="strider">DNA strider (m)</option>
+      <option value="swiss">SwisProt entry (m)</option>
+      <option value="text">Plain sequence (s)</option>
+      <option value="treecon">Treecon (m)</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="fasta" />
   </outputs>
   <tests>
     <test>
@@ -56,10 +53,8 @@
       <param name="out_format1" value="fasta"/>
       <output name="out_file1" file="emboss_pasteseq_out.fasta"/>
     </test>
-  </tests>
-  <code file="emboss_format_corrector.py" />
+  </tests>
   <help>
-
 .. class:: warningmark
 
 The input datasets need to be sequences.
@@ -67,15 +62,8 @@
 -----
 
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/pasteseq.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/pasteseq.html
   </help>
+  <expand macro="citations" />
 </tool>
--- a/emboss_patmatdb.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_patmatdb.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,36 +1,35 @@
-<tool id="EMBOSS: patmatdb67" name="patmatdb" version="5.0.0">
-  <description>Search a protein sequence with a motif</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>patmatdb -sequence $input1 -outfile $out_file1 -motif "$motif" -rformat3 $out_format1 -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>Main sequence</label>
-    </param>
-    <param name="motif" type="text" value="">
-      <label>Motif to search for</label>
-    </param>
-    <param name="out_format1" type="select">
-      <label>Output Report File Format</label>
-      <option value="dbmotif">DbMotif</option>
-      <option value="embl">EMBL</option>
-      <option value="genbank">GENBANK</option>
-      <option value="gff">GFF</option>
-      <option value="pir">PIR</option>
-      <option value="swiss">SwissProt</option>
-      <option value="diffseq">Diffseq</option>
-      <option value="excel">Excel (tab delimited)</option>
-      <option value="feattable">FeatTable</option>
-      <option value="motif">Motif</option>
-      <option value="regions">Regions</option>
-      <option value="seqtable">SeqTable</option>
-      <option value="simple">SRS Simple</option>
-      <option value="srs">SRS</option>
-      <option value="table">Table</option>
-      <option value="tagseq">TagSeq</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="dbmotif" name="out_file1" />
+<tool id="EMBOSS: patmatdb67" name="patmatdb" version="5.0.0">
+  <description>Search a protein sequence with a motif</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>patmatdb -sequence '$input1' -outfile '$out_file1' -motif '$motif' -rformat3 $out_format1 -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="Main sequence" />
+    <param name="motif" type="text" value="" label="Motif to search for" />
+    <param name="out_format1" type="select" label="Output report file format">
+      <option value="dbmotif">DbMotif</option>
+      <option value="embl">EMBL</option>
+      <option value="genbank">GENBANK</option>
+      <option value="gff">GFF</option>
+      <option value="pir">PIR</option>
+      <option value="swiss">SwissProt</option>
+      <option value="diffseq">Diffseq</option>
+      <option value="excel">Excel (tab delimited)</option>
+      <option value="feattable">FeatTable</option>
+      <option value="motif">Motif</option>
+      <option value="regions">Regions</option>
+      <option value="seqtable">SeqTable</option>
+      <option value="simple">SRS Simple</option>
+      <option value="srs">SRS</option>
+      <option value="table">Table</option>
+      <option value="tagseq">TagSeq</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="dbmotif" />
   </outputs>
   <tests>
     <test>
@@ -39,19 +38,11 @@
       <param name="out_format1" value="excel"/>
       <output name="out_file1" file="emboss_patmatdb_out.tabular"/>
     </test>
-  </tests>
-  <code file="emboss_format_corrector.py" />
+  </tests>
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/patmatdb.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/patmatdb.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_pepcoil.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_pepcoil.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,32 +1,28 @@
-<tool id="EMBOSS: pepcoil68" name="pepcoil" version="5.0.0">
-  <description>Predicts coiled coil regions</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>pepcoil -sequence $input1 -outfile $out_file1 -window $window -coil $coil -frame $frame -other $other -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>Sequence</label>
-    </param>
-    <param name="window" type="text" value="28">
-      <label>Window size</label>
-    </param>
-    <param name="coil" type="select">
-      <label>Report coiled coil regions</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="frame" type="select">
-      <label>Show coil frameshifts</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="other" type="select">
-      <label>Report non coiled coil regions</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="pepcoil" name="out_file1" />
+<tool id="EMBOSS: pepcoil68" name="pepcoil" version="5.0.0.1">
+  <description>Predicts coiled coil regions</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <command>pepcoil -sequence '$input1' -outfile '$out_file1' -window $window -coil $coil -frame $frame -other $other -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="Sequence" />
+    <param name="window" type="integer" value="28" label="Window size" />
+    <param name="coil" type="select" label="Report coiled coil regions">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="frame" type="select" label="Show coil frameshifts">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="other" type="select" label="Report non coiled coil regions">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="pepcoil" />
   </outputs>
   <tests>
     <test>
@@ -37,18 +33,11 @@
       <param name="other" value="yes"/>
       <output name="out_file1" file="emboss_pepcoil_out.pepcoil"/>
     </test>
-  </tests>
+  </tests>
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/pepcoil.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/pepcoil.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_pepinfo.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_pepinfo.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,36 +1,27 @@
-<tool id="EMBOSS: pepinfo69" name="pepinfo" version="5.0.0">
+<tool id="EMBOSS: pepinfo69" name="pepinfo" version="5.0.0.1">
   <!-- puts file info in output files -->
-  <description>Plots simple amino acid properties in parallel</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command interpreter="perl">emboss_single_outputfile_wrapper.pl pepinfo -sequence $input1 -outfile $out_file1 -goutfile $out_file2 -graph png -hwindow $hwindow $plot_type -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>Sequence</label>
-    </param>
-    <param name="hwindow" type="text" value="9">
-      <label>Window size for hydropathy averaging</label>
-    </param>
-    <param name="plot_type" type="select">
-      <label>Choose a plot type</label>
-      <option value="-generalplot yes -hydropathyplot no">Histogram of general properties</option>
-      <option value="-generalplot no -hydropathyplot yes">Graphs of hydropathy</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="pepinfo" name="out_file1" />
-    <data format="png" name="out_file2" />
-  </outputs>
+  <description>Plots simple amino acid properties in parallel</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <command>perl '$__tool_directory__/emboss_single_outputfile_wrapper.pl' pepinfo -sequence '$input1' -outfile '$out_file1' -goutfile '$out_file2' -graph png -hwindow $hwindow $plot_type -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="Sequence" />
+    <param name="hwindow" type="integer" value="9" label="Window size for hydropathy averaging" />
+    <param name="plot_type" type="select" label="Choose a plot type">
+      <option value="-generalplot yes -hydropathyplot no">Histogram of general properties</option>
+      <option value="-generalplot no -hydropathyplot yes">Graphs of hydropathy</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="pepinfo" />
+    <data name="out_file2" format="png" />
+  </outputs>
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/pepinfo.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/pepinfo.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_pepnet.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_pepnet.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,41 +1,28 @@
-<tool id="EMBOSS: pepnet70" name="pepnet" version="5.0.0">
+<tool id="EMBOSS: pepnet70" name="pepnet" version="5.0.0">
   <!-- graphical output file with path information -->
-  <description>Displays proteins as a helical net</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>pepnet -sequence $input1 -graph png -goutfile $out_file1 -squares $squares -diamonds $diamonds -octags $octags -amphipathic $amphipathic -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>Sequence</label>
-    </param>
-    <param name="squares" type="text" value="ILVM">
-      <label>Residues to mark with squares</label>
-    </param>
-    <param name="diamonds" type="text" value="DENQST">
-      <label>Residues to mark with diamonds</label>
-    </param>
-    <param name="octags" type="text" value="HKR ">
-      <label>Residues to mark with octagons</label>
-    </param>
-    <param name="amphipathic" type="select">
-      <label>If this is true then the residues ACFGILMVWY are marked as squares and all other residues are unmarked. This overrides any other markup that you may have specified</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="png" name="out_file1" />
-  </outputs>
+  <description>Displays proteins as a helical net</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <command>pepnet -sequence '$input1' -graph png -goutfile '$out_file1' -squares '$squares' -diamonds '$diamonds' -octags '$octags' -amphipathic $amphipathic -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="Sequence" />
+    <param name="squares" type="text" value="ILVM" label="Residues to mark with squares" />
+    <param name="diamonds" type="text" value="DENQST" label="Residues to mark with diamonds" />
+    <param name="octags" type="text" value="HKR" label="Residues to mark with octagons" />
+    <param name="amphipathic" type="select" label="Amphipathic?" help="If this is true then the residues ACFGILMVWY are marked as squares and all other residues are unmarked. This overrides any other markup that you may have specified">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="png" />
+  </outputs>
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/pepnet.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/pepnet.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_pepstats.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_pepstats.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,19 +1,19 @@
-<tool id="EMBOSS: pepstats71" name="pepstats" version="5.0.0">
-  <description>Protein statistics</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>pepstats -sequence $input1 -outfile $out_file1 -termini $termini -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>Sequence</label>
-    </param>
-    <param name="termini" type="select">
-      <label>Include charge at N and C terminus</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="pepstats" name="out_file1" />
+<tool id="EMBOSS: pepstats71" name="pepstats" version="5.0.0">
+  <description>Protein statistics</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <command>pepstats -sequence '$input1' -outfile '$out_file1' -termini $termini -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="Sequence" />
+    <param name="termini" type="select" label="Include charge at N and C terminus">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="pepstats" />
   </outputs>
   <tests>
     <test>
@@ -21,18 +21,11 @@
       <param name="termini" value="yes"/>
       <output name="out_file1" file="emboss_pepstats_out.pepstats"/>
     </test>
-  </tests>
+  </tests>
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/pepstats.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/pepstats.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_pepwheel.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_pepwheel.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,53 +1,35 @@
-<tool id="EMBOSS: pepwheel72" name="pepwheel" version="5.0.0">
+<tool id="EMBOSS: pepwheel72" name="pepwheel" version="5.0.0.1">
   <!-- produces png file -->
-  <description>Shows protein sequences as helices</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command interpreter="perl">emboss_single_outputfile_wrapper.pl pepwheel -sequence $input1 -graph png -goutfile $out_file1 -squares $squares -diamonds $diamonds -octags $octags -amphipathic
-  $amphipathic -steps $steps -turns $turns -wheel $wheel -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>Sequence</label>
-    </param>
-    <param name="steps" type="text" value="18">
-      <label>Steps, the number of residues plotted per turn is this value divided by the 'turns' value</label>
-    </param>
-    <param name="turns" type="text" value="5">
-      <label>Turns, the number of residues plotted per turn is the 'steps' value divided by this value</label>
-    </param>
-    <param name="squares" type="text" value="ILVM">
-      <label>Residues to mark with squares</label>
-    </param>
-    <param name="diamonds" type="text" value="DENQST">
-      <label>Residues to mark with diamonds</label>
-    </param>
-    <param name="octags" type="text" value="HKR">
-      <label>Residues to mark with octagons</label>
-    </param>
-    <param name="wheel" type="select">
-      <label>Plot the wheel</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="amphipathic" type="select">
-      <label>If this is true then the residues ACFGILMVWY are marked as squares and all other residues are unmarked. This overrides any other markup that you may have specified</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="png" name="out_file1" />
-  </outputs>
+  <description>Shows protein sequences as helices</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <command>perl '$__tool_directory__/emboss_single_outputfile_wrapper.pl' pepwheel -sequence '$input1' -graph png -goutfile '$out_file1' -squares '$squares' -diamonds '$diamonds' -octags '$octags' -amphipathic
+  $amphipathic -steps $steps -turns $turns -wheel $wheel -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="Sequence" />
+    <param name="steps" type="integer" value="18" label="Steps, the number of residues plotted per turn is this value divided by the 'turns' value" />
+    <param name="turns" type="integer" value="5" label="Turns, the number of residues plotted per turn is the 'steps' value divided by this value" />
+    <param name="squares" type="text" value="ILVM" label="Residues to mark with squares" />
+    <param name="diamonds" type="text" value="DENQST" label="Residues to mark with diamonds" />
+    <param name="octags" type="text" value="HKR" label="Residues to mark with octagons" />
+    <param name="wheel" type="select" label="Plot the wheel">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="amphipathic" type="select" label="Amphipathic?" help="If this is true then the residues ACFGILMVWY are marked as squares and all other residues are unmarked. This overrides any other markup that you may have specified" >
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="png" />
+  </outputs>
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/pepwheel.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/pepwheel.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_pepwindow.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_pepwindow.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,30 +1,22 @@
-<tool id="EMBOSS: pepwindow73" name="pepwindow" version="5.0.0">
+<tool id="EMBOSS: pepwindow73" name="pepwindow" version="5.0.0.1">
   <!-- produces png file -->
-  <description>Displays protein hydropathy</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command interpreter="perl">emboss_single_outputfile_wrapper.pl pepwindow -sequence $input1 -graph png -goutfile $out_file1 -length $length -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>Sequence</label>
-    </param>
-    <param name="length" type="text" value="7">
-      <label>Window size</label>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="png" name="out_file1" />
-  </outputs>
+  <description>Displays protein hydropathy</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <command>perl '$__tool_directory__/emboss_single_outputfile_wrapper.pl' pepwindow -sequence '$input1' -graph png -goutfile '$out_file1' -length $length -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="Sequence" />
+    <param name="length" type="integer" value="7" label="Window size" />
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="png" />
+  </outputs>
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/pepwindow.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/pepwindow.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_pepwindowall.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_pepwindowall.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,30 +1,22 @@
-<tool id="EMBOSS: pepwindowall74" name="pepwindowall" version="5.0.0">
+<tool id="EMBOSS: pepwindowall74" name="pepwindowall" version="5.0.0.1">
   <!-- produces png file -->
-  <description>Displays protein hydropathy of a set of sequences</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command interpreter="perl">emboss_single_outputfile_wrapper.pl pepwindowall -sequence $input1 -graph png -goutfile $out_file1 -length $length -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>Sequence</label>
-    </param>
-    <param name="length" type="text" value="7">
-      <label>Window size</label>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="png" name="out_file1" />
-  </outputs>
+  <description>Displays protein hydropathy of a set of sequences</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <command>perl '$__tool_directory__/emboss_single_outputfile_wrapper.pl' pepwindowall -sequence '$input1' -graph png -goutfile '$out_file1' -length $length -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="Sequence" />
+    <param name="length" type="integer" value="7" label="Window size" />
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="png" />
+  </outputs>
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/pepwindowall.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/pepwindowall.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_plotcon.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_plotcon.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,30 +1,22 @@
-<tool id="EMBOSS: plotcon75" name="plotcon" version="5.0.0">
+<tool id="EMBOSS: plotcon75" name="plotcon" version="5.0.0.1">
   <!-- produces png file -->
-  <description>Plot quality of conservation of a sequence alignment</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command interpreter="perl">emboss_single_outputfile_wrapper.pl plotcon -sequences $input1 -graph png -goutfile $out_file1 -winsize $winsize -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>Sequence</label>
-    </param>
-    <param name="winsize" type="text" value="4">
-      <label>Number of columns to average alignment quality over</label>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="png" name="out_file1" />
-  </outputs>
+  <description>Plot quality of conservation of a sequence alignment</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <command>perl '$__tool_directory__/emboss_single_outputfile_wrapper.pl' plotcon -sequences '$input1' -graph png -goutfile '$out_file1' -winsize $winsize -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="Sequence" />
+    <param name="winsize" type="integer" value="4" label="Number of columns to average alignment quality over" />
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="png" />
+  </outputs>
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/plotcon.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/plotcon.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_plotorf.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_plotorf.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,21 +1,18 @@
-<tool id="EMBOSS: plotorf76" name="plotorf" version="5.0.0">
+<tool id="EMBOSS: plotorf76" name="plotorf" version="5.0.0">
   <!-- produces png file output -->
-  <description>Plot potential open reading frames</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command interpreter="perl">emboss_single_outputfile_wrapper.pl plotorf -sequence $input1 -graph png -goutfile $out_file1 -start $start -stop $stop -auto</command>
-  <inputs>
-    <param format="fasta" name="input1" type="data">
-      <label>Sequence</label>
-    </param>
-    <param name="start" type="text" value="ATG">
-      <label>Start codons</label>
-    </param>
-    <param name="stop" type="text" value="TAA">
-      <label>Stop codons</label>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="png" name="out_file1" />
+  <description>Plot potential open reading frames</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <command>perl '$__tool_directory__/emboss_single_outputfile_wrapper.pl' plotorf -sequence '$input1' -graph png -goutfile '$out_file1' -start '$start' -stop '$stop' -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="fasta" label="Sequence" />
+    <param name="start" type="text" value="ATG" label="Start codons" />
+    <param name="stop" type="text" value="TAA" label="Stop codons" />
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="png" />
   </outputs>
   <!--  <tests>
     <test>
@@ -24,9 +21,8 @@
       <param name="stop" value="TAA"/>
       <output name="out_file1" file="emboss_plotorf_out.png"/>
     </test>
-  </tests> -->
+  </tests> -->
   <help>
-
 .. class:: warningmark
 
 The input dataset needs to be sequences.
@@ -34,15 +30,8 @@
 -----
 
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/plotorf.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/plotorf.html
   </help>
+  <expand macro="citations" />
 </tool>
--- a/emboss_polydot.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_polydot.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,28 +1,24 @@
-<tool id="EMBOSS: polydot77" name="polydot" version="5.0.0">
+<tool id="EMBOSS: polydot77" name="polydot" version="5.0.0.1">
   <!-- produces png file, not added functional tests -->
-  <description>Displays all-against-all dotplots of a set of sequences</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command interpreter="perl">emboss_single_outputfile_wrapper.pl polydot -sequence $input1 -graph png -goutfile $output2 -outfeat $output1 -wordsize $wordsize -boxit $boxit -dumpfeat yes -gap
-  $gap -auto</command>
-  <inputs>
-    <param format="fasta" name="input1" type="data">
-      <label>Sequence</label>
-    </param>
-    <param name="wordsize" type="text" value="6">
-      <label>Word size</label>
-    </param>
-    <param name="boxit" type="select">
-      <label>Draw a box around each dotplot</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="gap" type="text" value="10">
-      <label>Size of gap</label>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="polydot" name="output1" />
-    <data format="png" name="output2" />
+  <description>Displays all-against-all dotplots of a set of sequences</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <command>perl '$__tool_directory__/emboss_single_outputfile_wrapper.pl' polydot -sequence '$input1' -graph png -goutfile '$output2' -outfeat '$output1' -wordsize $wordsize -boxit $boxit -dumpfeat yes -gap
+  $gap -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="fasta" label="Sequence" />
+    <param name="wordsize" type="integer" value="6" label="Word size" />
+    <param name="boxit" type="select" label="Draw a box around each dotplot">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="gap" type="integer" value="10" label="Size of gap" />
+  </inputs>
+  <outputs>
+    <data name="output1" format="polydot" />
+    <data name="output2" format="png" />
   </outputs>
 <!--    <tests>
     <test>
@@ -32,9 +28,8 @@
       <param name="gap" value="10"/>
       <output name="output1" file="emboss_polydot_out.png"/>
     </test>
-  </tests>-->
+  </tests>-->
   <help>
-
 .. class:: warningmark
 
 The input dataset needs to be sequences.
@@ -42,15 +37,8 @@
 -----
 
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/polydot.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/polydot.html
   </help>
+  <expand macro="citations" />
 </tool>
--- a/emboss_preg.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_preg.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,29 +1,21 @@
-<tool id="EMBOSS: preg78" name="preg" version="5.0.0">
-  <description>Regular expression search of a protein sequence</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>preg -sequence $input1 -outfile $out_file1 -pattern "$pattern" -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>Sequence 1</label>
-    </param>
-    <param name="pattern" type="text" value="(ACD)">
-      <label>Regular expression pattern</label>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="preg" name="out_file1" />
-  </outputs>
+<tool id="EMBOSS: preg78" name="preg" version="5.0.0">
+  <description>Regular expression search of a protein sequence</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <command>preg -sequence '$input1' -outfile '$out_file1' -pattern '$pattern' -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="Sequence" />
+    <param name="pattern" type="text" value="(ACD)" label="Regular expression pattern" />
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="preg" />
+  </outputs>
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/preg.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/preg.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_prettyplot.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_prettyplot.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,121 +1,83 @@
-<tool id="EMBOSS: prettyplot79" name="prettyplot" version="5.0.0">
+<tool id="EMBOSS: prettyplot79" name="prettyplot" version="5.0.0.1">
   <!-- produces png output with file name -->
-  <description>Displays aligned sequences, with colouring and boxing</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>prettyplot -sequences $input1 -graph png -goutfile $out_file1 -residuesperline $residuesperline -resbreak $resbreak -ccolours $ccolours -cidentity $cidentity -csimilarity $csimilarity
-  -cother $cother -docolour $docolour -gtitle $title -pair $pair -identity $identity -box $box -boxcol $boxcol -boxcolval $boxcolval -name $name -maxnamelen $maxnamelen -number $number -listoptions
-  $listoptions -consensus $consensus -collision $collision -alternative $alternative -showscore $showscore -portrait $portrait -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>Sequence</label>
-    </param>
-    <param name="residuesperline" type="text" value="50">
-      <label>The number of residues to be displayed on each line</label>
-    </param>
-    <param name="resbreak" type="text" value="50">
-      <label>Residues before a space</label>
-    </param>
-    <param name="ccolours" type="select">
-      <label>Colour residues by their consensus value</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="cidentity" type="text" value="RED">
-      <label>Colour to display identical residues</label>
-    </param>
-    <param name="csimilarity" type="text" value="GREEN">
-      <label>Colour to display similar residues</label>
-    </param>
-    <param name="cother" type="text" value="BLACK">
-      <label>Colour to display other residues</label>
-    </param>
-    <param name="docolour" type="select">
-      <label>Colour residues by table oily, amide etc.</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="title" type="select">
-      <label>Display the title</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="pair" type="text" value="1.5,1.0,0.5">
-      <label>Values to represent identical similar related</label>
-    </param>
-    <param name="identity" type="text" value="0">
-      <label>Only match those which are identical in all sequences</label>
-    </param>
-    <param name="box" type="select">
-      <label>Display prettyboxes</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="boxcol" type="select">
-      <label>Colour the background in the boxes</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="boxcolval" type="text" value="GREY">
-      <label>Colour to be used for background</label>
-    </param>
-    <param name="name" type="select">
-      <label>Display the sequence names</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="maxnamelen" type="text" value="10">
-      <label>Margin size for the sequence name</label>
-    </param>
-    <param name="number" type="select">
-      <label>Display the residue number</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="listoptions" type="select">
-      <label>Display the date and options used</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="consensus" type="select">
-      <label>Display the consensus</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="collision" type="select">
-      <label>Allow collisions in calculating consensus</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="alternative" type="select">
-      <label>Use alternative collisions routine</label>
-      <option value="0">Normal collision check</option>
-      <option value="1">Checks identical scores with the max score found. So if any other residue matches the identical score then a collision has occurred</option>
-      <option value="2">If another residue has a greater than or equal to matching score and these do not match then a collision has occurred</option>
-      <option value="3">Checks all those not in the current consensus.If any of these give a top score for matching or identical scores then a collision has occured</option>
-    </param>
-    <param name="showscore" type="text" value="-1">
-      <label>Print residue scores</label>
-    </param>
-    <param name="portrait" type="select">
-      <label>Set page to Portrait</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="png" name="out_file1" />
-  </outputs>
+  <description>Displays aligned sequences, with colouring and boxing</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <command>prettyplot -sequences '$input1' -graph png -goutfile '$out_file1' -residuesperline $residuesperline -resbreak $resbreak -ccolours $ccolours -cidentity '$cidentity' -csimilarity '$csimilarity'
+  -cother '$cother' -docolour $docolour -gtitle $title -pair '$pair' -identity $identity -box $box -boxcol $boxcol -boxcolval '$boxcolval' -name $name -maxnamelen $maxnamelen -number $number -listoptions
+  $listoptions -consensus $consensus -collision $collision -alternative $alternative -showscore $showscore -portrait $portrait -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="Sequence" />
+    <param name="residuesperline" type="integer" value="50" label="The number of residues to be displayed on each line" />
+    <param name="resbreak" type="integer" value="50" label="Residues before a space" />
+    <param name="ccolours" type="select" label="Colour residues by their consensus value">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="cidentity" type="text" value="RED" label="Colour to display identical residues" />
+    <param name="csimilarity" type="text" value="GREEN" label="Colour to display similar residues" />
+    <param name="cother" type="text" value="BLACK" label="Colour to display other residues" />
+    <param name="docolour" type="select" label="Colour residues by table oily, amide etc.">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="title" type="select" label="Display the title">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="pair" type="text" value="1.5,1.0,0.5" label="Values to represent identical similar related" />
+    <param name="identity" type="integer" value="0" label="Only match those which are identical in all sequences" />
+    <param name="box" type="select" label="Display prettyboxes">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="boxcol" type="select" label="Colour the background in the boxes">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="boxcolval" type="text" value="GREY" label="Colour to be used for background" />
+    <param name="name" type="select" label="Display the sequence names">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="maxnamelen" type="integer" value="10" label="Margin size for the sequence name" />
+    <param name="number" type="select" label="Display the residue number">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="listoptions" type="select" label="Display the date and options used">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="consensus" type="select" label="Display the consensus">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="collision" type="select" label="Allow collisions in calculating consensus">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="alternative" type="select" label="Use alternative collisions routine">
+      <option value="0">Normal collision check</option>
+      <option value="1">Checks identical scores with the max score found. So if any other residue matches the identical score then a collision has occurred</option>
+      <option value="2">If another residue has a greater than or equal to matching score and these do not match then a collision has occurred</option>
+      <option value="3">Checks all those not in the current consensus.If any of these give a top score for matching or identical scores then a collision has occured</option>
+    </param>
+    <param name="showscore" type="integer" value="-1" label="Print residue scores" />
+    <param name="portrait" type="select" label="Set page to Portrait">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="png" />
+  </outputs>
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/prettyplot.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/prettyplot.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_prettyseq.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_prettyseq.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,32 +1,28 @@
-<tool id="EMBOSS: prettyseq80" name="prettyseq" version="5.0.0">
-  <description>Output sequence with translated ranges</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>prettyseq -sequence $input1 -outfile $out_file1 -ruler $ruler -plabel $plabel -nlabel $nlabel -width $width -auto</command>
-  <inputs>
-    <param format="fasta" name="input1" type="data">
-      <label>Sequence</label>
-    </param>
-    <param name="ruler" type="select">
-      <label>Add a ruler</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="plabel" type="select">
-      <label>Number translations</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="nlabel" type="select">
-      <label>Number DNA sequence</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="width" type="text" value="60">
-      <label>Width of screen</label>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="prettyseq" name="out_file1" />
+<tool id="EMBOSS: prettyseq80" name="prettyseq" version="5.0.0.1">
+  <description>Output sequence with translated ranges</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <command>prettyseq -sequence '$input1' -outfile '$out_file1' -ruler $ruler -plabel $plabel -nlabel $nlabel -width $width -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="fasta" label="Sequence" />
+    <param name="ruler" type="select" label="Add a ruler">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="plabel" type="select" label="Number translations">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="nlabel" type="select" label="Number DNA sequence">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="width" type="integer" value="60" min="10" label="Width of screen" />
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="prettyseq" />
   </outputs>
   <tests>
     <test>
@@ -37,9 +33,8 @@
       <param name="width" value="60"/>
       <output name="out_file1" file="emboss_prettyseq_out.prettyseq"/>
     </test>
-  </tests>
+  </tests>
   <help>
-
 .. class:: warningmark
 
 The input dataset needs to be sequences.
@@ -47,15 +42,8 @@
 -----
 
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/prettyseq.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/prettyseq.html
   </help>
+  <expand macro="citations" />
 </tool>
--- a/emboss_primersearch.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_primersearch.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,20 +1,17 @@
-<tool id="EMBOSS: primersearch81" name="primersearch" version="5.0.0">
-  <description>Searches DNA sequences for matches with primer pairs</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>primersearch -seqall $input1 -infile $input2 -outfile $out_file1 -mismatchpercent $mismatchpercent -auto</command>
-  <inputs>
-    <param format="fasta" name="input1" type="data">
-      <label>Main sequences</label>
-    </param>
-    <param format="data" name="input2" type="data">
-      <label>Primer file</label>
-    </param>
-    <param name="mismatchpercent" type="text" value="0">
-      <label>Allowed percent mismatch</label>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="primersearch" name="out_file1" />
+<tool id="EMBOSS: primersearch81" name="primersearch" version="5.0.0.1">
+  <description>Searches DNA sequences for matches with primer pairs</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <command>primersearch -seqall '$input1' -infile '$input2' -outfile '$out_file1' -mismatchpercent $mismatchpercent -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="fasta" label="Main sequences" />
+    <param name="input2" type="data" format="data" label="Primer file" />
+    <param name="mismatchpercent" type="integer" value="0" label="Allowed percent mismatch" />
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="primersearch" />
   </outputs>
   <tests>
     <test>
@@ -23,19 +20,11 @@
       <param name="mismatchpercent" value="0"/>
       <output name="out_file1" file="emboss_primersearch_out.primersearch"/>
     </test>
-  </tests>
+  </tests>
   <help>
-
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/primersearch.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/primersearch.html
   </help>
+  <expand macro="citations" />
 </tool>
--- a/emboss_revseq.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_revseq.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,56 +1,55 @@
-<tool id="EMBOSS: revseq82" name="revseq" version="5.0.0">
-  <description>Reverse and complement a sequence</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>revseq -sequence $input1 -outseq $out_file1 -reverse $reverse -complement $complement -osformat2 $out_format1 -auto</command>
-  <inputs>
-    <param format="fasta" name="input1" type="data">
-      <label>Sequences</label>
-    </param>
-    <param name="reverse" type="select">
-      <label>Reverse the sequence</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="complement" type="select">
-      <label>Complement the sequence</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="out_format1" type="select">
-      <label>Output Sequence File Format</label>
-      <option value="fasta">FASTA (m)</option>
-      <option value="acedb">ACeDB (m)</option>
-      <option value="asn1">ASN.1 (m)</option>
-      <option value="clustal">Clustal (m)</option>
-      <option value="codata">CODATA (m)</option>
-      <option value="embl">EMBL (m)</option>
-      <option value="fitch">Fitch (m)</option>
-      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
-      <option value="genbank">GENBANK (m)</option>
-      <option value="gff">GFF (m)</option>
-      <option value="hennig86">Hennig86 (m)</option>
-      <option value="ig">Intelligenetics (m)</option>
-      <option value="jackknifer">Jackknifer (m)</option>
-      <option value="jackknifernon">Jackknifernon (m)</option>
-      <option value="mega">Mega (m)</option>
-      <option value="meganon">Meganon (m)</option>
-      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
-      <option value="pir">NBRF (PIR) (m)</option>
-      <option value="ncbi">NCBI style FASTA (m)</option>
-      <option value="nexus">Nexus/PAUP (m)</option>
-      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
-      <option value="phylip">PHYLIP interleaved (m)</option>
-      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
-      <option value="selex">SELEX (m)</option>
-      <option value="staden">Staden (s)</option>
-      <option value="strider">DNA strider (m)</option>
-      <option value="swiss">SwisProt entry (m)</option>
-      <option value="text">Plain sequence (s)</option>
-      <option value="treecon">Treecon (m)</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="fasta" name="out_file1" />
+<tool id="EMBOSS: revseq82" name="revseq" version="5.0.0">
+  <description>Reverse and complement a sequence</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>revseq -sequence '$input1' -outseq '$out_file1' -reverse $reverse -complement $complement -osformat2 $out_format1 -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="fasta" label="Sequences" />
+    <param name="reverse" type="select" label="Reverse the sequence">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="complement" type="select" label="Complement the sequence">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="out_format1" type="select" label="Output sequence file format">
+      <option value="fasta">FASTA (m)</option>
+      <option value="acedb">ACeDB (m)</option>
+      <option value="asn1">ASN.1 (m)</option>
+      <option value="clustal">Clustal (m)</option>
+      <option value="codata">CODATA (m)</option>
+      <option value="embl">EMBL (m)</option>
+      <option value="fitch">Fitch (m)</option>
+      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
+      <option value="genbank">GENBANK (m)</option>
+      <option value="gff">GFF (m)</option>
+      <option value="hennig86">Hennig86 (m)</option>
+      <option value="ig">Intelligenetics (m)</option>
+      <option value="jackknifer">Jackknifer (m)</option>
+      <option value="jackknifernon">Jackknifernon (m)</option>
+      <option value="mega">Mega (m)</option>
+      <option value="meganon">Meganon (m)</option>
+      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
+      <option value="pir">NBRF (PIR) (m)</option>
+      <option value="ncbi">NCBI style FASTA (m)</option>
+      <option value="nexus">Nexus/PAUP (m)</option>
+      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
+      <option value="phylip">PHYLIP interleaved (m)</option>
+      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
+      <option value="selex">SELEX (m)</option>
+      <option value="staden">Staden (s)</option>
+      <option value="strider">DNA strider (m)</option>
+      <option value="swiss">SwisProt entry (m)</option>
+      <option value="text">Plain sequence (s)</option>
+      <option value="treecon">Treecon (m)</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="fasta" />
   </outputs>
   <tests>
     <test>
@@ -60,10 +59,8 @@
       <param name="out_format1" value="fasta"/>
       <output name="out_file1" file="emboss_revseq_out.fasta"/>
     </test>
-  </tests>
-  <code file="emboss_format_corrector.py" />
+  </tests>
   <help>
-
 .. class:: warningmark
 
 The input dataset needs to be sequences.
@@ -71,15 +68,8 @@
 -----
 
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/revseq.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/revseq.html
   </help>
+  <expand macro="citations" />
 </tool>
--- a/emboss_seqmatchall.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_seqmatchall.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,34 +1,33 @@
-<tool id="EMBOSS: seqmatchall83" name="seqmatchall" version="5.0.0">
-  <description>All-against-all comparison of a set of sequences</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>seqmatchall -sequence $input1 -outfile $out_file1 -wordsize $wordsize -aformat2 $out_format1 -auto</command>
-  <inputs>
-    <param format="fasta" name="input1" type="data">
-      <label>Sequences</label>
-    </param>
-    <param name="wordsize" type="text" value="4">
-      <label>Word size</label>
-    </param>
-    <param name="out_format1" type="select">
-      <label>Output Alignment File Format</label>
-      <option value="match">Match (m)</option>
-      <option value="simple">Simple (m)</option>
-      <option value="fasta">FASTA (m)</option>
-      <option value="msf">MSF (m)</option>
-      <option value="srs">SRS (m)</option>
-      <option value="pair">Pair (p)</option>
-      <option value="markx0">Markx0 (p)</option>
-      <option value="markx1">Markx1 (p)</option>
-      <option value="markx2">Markx2 (p)</option>
-      <option value="markx3">Markx3 (p)</option>
-      <option value="markx10">Markx10 (p)</option>
-      <option value="srspair">SRS pair (p)</option>
+<tool id="EMBOSS: seqmatchall83" name="seqmatchall" version="5.0.0.1">
+  <description>All-against-all comparison of a set of sequences</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>seqmatchall -sequence '$input1' -outfile '$out_file1' -wordsize $wordsize -aformat2 $out_format1 -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="fasta" label="Sequences" />
+    <param name="wordsize" type="integer" value="4" label="Word size" />
+    <param name="out_format1" type="select" label="Output alignment file format">
+      <option value="match">Match (m)</option>
+      <option value="simple">Simple (m)</option>
+      <option value="fasta">FASTA (m)</option>
+      <option value="msf">MSF (m)</option>
+      <option value="srs">SRS (m)</option>
+      <option value="pair">Pair (p)</option>
+      <option value="markx0">Markx0 (p)</option>
+      <option value="markx1">Markx1 (p)</option>
+      <option value="markx2">Markx2 (p)</option>
+      <option value="markx3">Markx3 (p)</option>
+      <option value="markx10">Markx10 (p)</option>
+      <option value="srspair">SRS pair (p)</option>
       <option value="score">Score (p)</option>
-      <option value="seqmatchall">Seqmatchall Output File</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="seqmatchall" name="out_file1" />.
+      <option value="seqmatchall">Seqmatchall Output File</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="seqmatchall" />
   </outputs>
   <tests>
     <test>
@@ -37,10 +36,8 @@
       <param name="out_format1" value="fasta"/>
       <output name="out_file1" file="emboss_seqmatchall_out.fasta"/>
     </test>
-  </tests>
-  <code file="emboss_format_corrector.py" />
+  </tests>
   <help>
-
 .. class:: warningmark
 
 The input dataset needs to be sequences.
@@ -48,15 +45,8 @@
 -----
 
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/seqmatchall.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/seqmatchall.html
   </help>
+  <expand macro="citations" />
 </tool>
--- a/emboss_seqret.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_seqret.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,56 +1,55 @@
-<tool id="EMBOSS: seqret84" name="seqret" version="5.0.0">
-  <description>Reads and writes sequences</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>seqret -sequence $input1 -outseq $out_file1 -feature $feature -firstonly $firstonly -osformat2 $out_format1 -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>Sequences</label>
-    </param>
-    <param name="feature" type="select">
-      <label>Use feature information</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="firstonly" type="select">
-      <label>Read one sequence and stop</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="out_format1" type="select">
-      <label>Output Sequence File Format</label>
-      <option value="fasta">FASTA (m)</option>
-      <option value="acedb">ACeDB (m)</option>
-      <option value="asn1">ASN.1 (m)</option>
-      <option value="clustal">Clustal (m)</option>
-      <option value="codata">CODATA (m)</option>
-      <option value="embl">EMBL (m)</option>
-      <option value="fitch">Fitch (m)</option>
-      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
-      <option value="genbank">GENBANK (m)</option>
-      <option value="gff">GFF (m)</option>
-      <option value="hennig86">Hennig86 (m)</option>
-      <option value="ig">Intelligenetics (m)</option>
-      <option value="jackknifer">Jackknifer (m)</option>
-      <option value="jackknifernon">Jackknifernon (m)</option>
-      <option value="mega">Mega (m)</option>
-      <option value="meganon">Meganon (m)</option>
-      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
-      <option value="pir">NBRF (PIR) (m)</option>
-      <option value="ncbi">NCBI style FASTA (m)</option>
-      <option value="nexus">Nexus/PAUP (m)</option>
-      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
-      <option value="phylip">PHYLIP interleaved (m)</option>
-      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
-      <option value="selex">SELEX (m)</option>
-      <option value="staden">Staden (s)</option>
-      <option value="strider">DNA strider (m)</option>
-      <option value="swiss">SwisProt entry (m)</option>
-      <option value="text">Plain sequence (s)</option>
-      <option value="treecon">Treecon (m)</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="fasta" name="out_file1" />
+<tool id="EMBOSS: seqret84" name="seqret" version="5.0.0">
+  <description>Reads and writes sequences</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>seqret -sequence '$input1' -outseq '$out_file1' -feature $feature -firstonly $firstonly -osformat2 $out_format1 -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="Sequences" />
+    <param name="feature" type="select" label="Use feature information">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="firstonly" type="select" label="Read one sequence and stop">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="out_format1" type="select" label="Output sequence file format">
+      <option value="fasta">FASTA (m)</option>
+      <option value="acedb">ACeDB (m)</option>
+      <option value="asn1">ASN.1 (m)</option>
+      <option value="clustal">Clustal (m)</option>
+      <option value="codata">CODATA (m)</option>
+      <option value="embl">EMBL (m)</option>
+      <option value="fitch">Fitch (m)</option>
+      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
+      <option value="genbank">GENBANK (m)</option>
+      <option value="gff">GFF (m)</option>
+      <option value="hennig86">Hennig86 (m)</option>
+      <option value="ig">Intelligenetics (m)</option>
+      <option value="jackknifer">Jackknifer (m)</option>
+      <option value="jackknifernon">Jackknifernon (m)</option>
+      <option value="mega">Mega (m)</option>
+      <option value="meganon">Meganon (m)</option>
+      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
+      <option value="pir">NBRF (PIR) (m)</option>
+      <option value="ncbi">NCBI style FASTA (m)</option>
+      <option value="nexus">Nexus/PAUP (m)</option>
+      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
+      <option value="phylip">PHYLIP interleaved (m)</option>
+      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
+      <option value="selex">SELEX (m)</option>
+      <option value="staden">Staden (s)</option>
+      <option value="strider">DNA strider (m)</option>
+      <option value="swiss">SwisProt entry (m)</option>
+      <option value="text">Plain sequence (s)</option>
+      <option value="treecon">Treecon (m)</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="fasta" />
   </outputs>
   <tests>
     <test>
@@ -60,19 +59,11 @@
       <param name="out_format1" value="fasta"/>
       <output name="out_file1" file="emboss_seqret_out.fasta"/>
     </test>
-  </tests>
-  <code file="emboss_format_corrector.py" />
+  </tests>
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/seqret.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/seqret.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_showfeat.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_showfeat.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,131 +1,97 @@
-<tool id="EMBOSS: showfeat85" name="showfeat" version="5.0.0">
+<tool id="EMBOSS: showfeat85" name="showfeat" version="5.0.0.1">
   <!-- tool gives memory errors -->
-  <description>Show features of a sequence</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>showfeat -sequence $input1 -outfile $out_file1 -matchsource "$matchsource" -matchtype "$matchtype" -matchtag "$matchtag" -matchvalue "$matchvalue" -sort $sort -annotation "$annotation" -id
-  $id -description "$description" -scale "$scale" -width "$width" -collapse $collapse -forward $forward -reverse $reverse -unknown $unknown -strand $strand -source $source -position $position -type
-  $type -tags $tags -values $values -stricttags $stricttags -html $html_out1 -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>Sequences</label>
-    </param>
-    <param name="html_out1" type="select">
-      <label>Format output as an HTML table</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="matchsource" type="text" value="*">
-      <label>Feature source to match</label>
-    </param>
-    <param name="matchtype" type="text" value="*">
-      <label>Feature type to match</label>
-    </param>
-    <param name="matchtag" type="text" value="*">
-      <label>Feature tags to match</label>
-    </param>
-    <param name="matchvalue" type="text" value="*">
-      <label>Tag values to match</label>
-    </param>
-    <param name="sort" type="select">
-      <label>Sort by</label>
-      <option value="start">Start position</option>
-      <option value="source">Source</option>
-      <option value="type">Type</option>
-      <option value="nosort">No sorting done</option>
-      <option value="join">Join coding regions together</option>
-    </param>
-    <param name="annotation" type="text" value="">
-      <label>Regions to annotate by marking</label>
-    </param>
-    <param name="id" type="select">
-      <label>Display the ID name of the sequence</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="description" type="select">
-      <label>Display the description of the sequence</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="scale" type="select">
-      <label>Display the scale line</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="width" type="text" value="60">
-      <label>Screen width</label>
-    </param>
-    <param name="collapse" type="select">
-      <label>Collapse features</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="forward" type="select">
-      <label>Display forward sense features</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="reverse" type="select">
-      <label>Display reverse sense features</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="unknown" type="select">
-      <label>Display unknown sense features</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="strand" type="select">
-      <label>Display the strand of the features</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="source" type="select">
-      <label>Display the source of the features</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="position" type="select">
-      <label>SDisplay the start and end position of the features</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="type" type="select">
-      <label>Display the type of the features</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="tags" type="select">
-      <label>Display the tags and values of the features</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="values" type="select">
-      <label>Display the tag values of the features</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="stricttags" type="select">
-      <label>Display only those tag/value pairs in a feature that match the specified tag and value</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="showfeat" name="out_file1" />
-  </outputs>
-  <code file="emboss_format_corrector.py" />
+  <description>Show features of a sequence</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>showfeat -sequence '$input1' -outfile '$out_file1' -matchsource '$matchsource' -matchtype '$matchtype' -matchtag '$matchtag' -matchvalue '$matchvalue' -sort $sort -annotation '$annotation' -id
+  $id -description $description -scale $scale -width $width -collapse $collapse -forward $forward -reverse $reverse -unknown $unknown -strand $strand -source $source -position $position -type
+  $type -tags $tags -values $values -stricttags $stricttags -html $html_out1 -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="Sequences" />
+    <param name="html_out1" type="select" label="Format output as an HTML table">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="matchsource" type="text" value="*" label="Feature source to match" />
+    <param name="matchtype" type="text" value="*" label="Feature type to match" />
+    <param name="matchtag" type="text" value="*" label="Feature tags to match" />
+    <param name="matchvalue" type="text" value="*" label="Tag values to match" />
+    <param name="sort" type="select" label="Sort by">
+      <option value="start">Start position</option>
+      <option value="source">Source</option>
+      <option value="type">Type</option>
+      <option value="nosort">No sorting done</option>
+      <option value="join">Join coding regions together</option>
+    </param>
+    <param name="annotation" type="text" value="" label="Regions to annotate by marking" />
+    <param name="id" type="select" label="Display the ID name of the sequence">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="description" type="select" label="Display the description of the sequence">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="scale" type="select" label="Display the scale line">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="width" type="integer" value="60" label="Screen width" />
+    <param name="collapse" type="select" label="Collapse features">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="forward" type="select" label="Display forward sense features">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="reverse" type="select" label="Display reverse sense features">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="unknown" type="select" label="Display unknown sense features">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="strand" type="select" label="Display the strand of the features">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="source" type="select" label="Display the source of the features">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="position" type="select" label="Display the start and end position of the features">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="type" type="select" label="Display the type of the features">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="tags" type="select" label="Display the tags and values of the features">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="values" type="select" label="Display the tag values of the features">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="stricttags" type="select" label="Display only those tag/value pairs in a feature that match the specified tag and value">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="showfeat" />
+  </outputs>
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/showfeat.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/showfeat.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_shuffleseq.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_shuffleseq.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,54 +1,51 @@
-<tool id="EMBOSS: shuffleseq87" name="shuffleseq" version="5.0.0">
+<tool id="EMBOSS: shuffleseq87" name="shuffleseq" version="5.0.0.1">
   <!-- produces random outputs each time -->
-  <description>Shuffles a set of sequences maintaining composition</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>shuffleseq -sequence $input1 -outseq $out_file1 -shuffle "$shuffle" -osformat2 $out_format1 -auto</command>
-  <inputs>
-    <param format="fasta" name="input1" type="data">
-      <label>Sequences</label>
-    </param>
-    <param name="shuffle" type="text" value="1">
-      <label>Number of shuffles</label>
-    </param>
-    <param name="out_format1" type="select">
-      <label>Output Sequence File Format</label>
-      <option value="fasta">FASTA (m)</option>
-      <option value="acedb">ACeDB (m)</option>
-      <option value="asn1">ASN.1 (m)</option>
-      <option value="clustal">Clustal (m)</option>
-      <option value="codata">CODATA (m)</option>
-      <option value="embl">EMBL (m)</option>
-      <option value="fitch">Fitch (m)</option>
-      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
-      <option value="genbank">GENBANK (m)</option>
-      <option value="gff">GFF (m)</option>
-      <option value="hennig86">Hennig86 (m)</option>
-      <option value="ig">Intelligenetics (m)</option>
-      <option value="jackknifer">Jackknifer (m)</option>
-      <option value="jackknifernon">Jackknifernon (m)</option>
-      <option value="mega">Mega (m)</option>
-      <option value="meganon">Meganon (m)</option>
-      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
-      <option value="pir">NBRF (PIR) (m)</option>
-      <option value="ncbi">NCBI style FASTA (m)</option>
-      <option value="nexus">Nexus/PAUP (m)</option>
-      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
-      <option value="phylip">PHYLIP interleaved (m)</option>
-      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
-      <option value="selex">SELEX (m)</option>
-      <option value="staden">Staden (s)</option>
-      <option value="strider">DNA strider (m)</option>
-      <option value="swiss">SwisProt entry (m)</option>
-      <option value="text">Plain sequence (s)</option>
-      <option value="treecon">Treecon (m)</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="fasta" name="out_file1" />
-  </outputs>
-  <code file="emboss_format_corrector.py" />
+  <description>Shuffles a set of sequences maintaining composition</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>shuffleseq -sequence '$input1' -outseq '$out_file1' -shuffle $shuffle -osformat2 $out_format1 -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="fasta" label="Sequences" />
+    <param name="shuffle" type="integer" value="1" label="Number of shuffles" />
+    <param name="out_format1" type="select" label="Output sequence file format">
+      <option value="fasta">FASTA (m)</option>
+      <option value="acedb">ACeDB (m)</option>
+      <option value="asn1">ASN.1 (m)</option>
+      <option value="clustal">Clustal (m)</option>
+      <option value="codata">CODATA (m)</option>
+      <option value="embl">EMBL (m)</option>
+      <option value="fitch">Fitch (m)</option>
+      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
+      <option value="genbank">GENBANK (m)</option>
+      <option value="gff">GFF (m)</option>
+      <option value="hennig86">Hennig86 (m)</option>
+      <option value="ig">Intelligenetics (m)</option>
+      <option value="jackknifer">Jackknifer (m)</option>
+      <option value="jackknifernon">Jackknifernon (m)</option>
+      <option value="mega">Mega (m)</option>
+      <option value="meganon">Meganon (m)</option>
+      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
+      <option value="pir">NBRF (PIR) (m)</option>
+      <option value="ncbi">NCBI style FASTA (m)</option>
+      <option value="nexus">Nexus/PAUP (m)</option>
+      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
+      <option value="phylip">PHYLIP interleaved (m)</option>
+      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
+      <option value="selex">SELEX (m)</option>
+      <option value="staden">Staden (s)</option>
+      <option value="strider">DNA strider (m)</option>
+      <option value="swiss">SwisProt entry (m)</option>
+      <option value="text">Plain sequence (s)</option>
+      <option value="treecon">Treecon (m)</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="fasta" />
+  </outputs>
   <help>
-
 .. class:: warningmark
 
 The input dataset needs to be sequences.
@@ -56,15 +53,8 @@
 -----
 
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/shuffleseq.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/shuffleseq.html
   </help>
+  <expand macro="citations" />
 </tool>
--- a/emboss_sigcleave.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_sigcleave.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,41 +1,39 @@
-<tool id="EMBOSS: sigcleave88" name="sigcleave" version="5.0.0">
-  <description>Reports protein signal cleavage sites</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>sigcleave -sequence $input1 -outfile $out_file1 -minweight "$minweight" -prokaryote $prokaryote -rformat2 $out_format1 -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>Sequences</label>
-    </param>
-    <param name="minweight" type="text" value="3.5">
-      <label>Minimum scoring weight value for the predicted cleavage site</label>
-    </param>
-    <param name="prokaryote" type="select">
-      <label>Specifies the sequence is prokaryotic and changes the default scoring data file</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="out_format1" type="select">
-      <label>Output Report File Format</label>
-      <option value="motif">Motif</option>
-      <option value="embl">EMBL</option>
-      <option value="genbank">GENBANK</option>
-      <option value="gff">GFF</option>
-      <option value="pir">PIR</option>
-      <option value="swiss">SwissProt</option>
-      <option value="dbmotif">DbMotif</option>
-      <option value="diffseq">Diffseq</option>
-      <option value="excel">Excel (tab delimited)</option>
-      <option value="feattable">FeatTable</option>
-      <option value="regions">Regions</option>
-      <option value="seqtable">SeqTable</option>
-      <option value="simple">SRS Simple</option>
-      <option value="srs">SRS</option>
-      <option value="table">Table</option>
-      <option value="tagseq">TagSeq</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="motif" name="out_file1" />
+<tool id="EMBOSS: sigcleave88" name="sigcleave" version="5.0.0.1">
+  <description>Reports protein signal cleavage sites</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>sigcleave -sequence '$input1' -outfile '$out_file1' -minweight $minweight -prokaryote $prokaryote -rformat2 $out_format1 -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="Sequences" />
+    <param name="minweight" type="float" value="3.5" label="Minimum scoring weight value for the predicted cleavage site" />
+    <param name="prokaryote" type="select" label="Specifies the sequence is prokaryotic and changes the default scoring data file">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="out_format1" type="select" label="Output report file format">
+      <option value="motif">Motif</option>
+      <option value="embl">EMBL</option>
+      <option value="genbank">GENBANK</option>
+      <option value="gff">GFF</option>
+      <option value="pir">PIR</option>
+      <option value="swiss">SwissProt</option>
+      <option value="dbmotif">DbMotif</option>
+      <option value="diffseq">Diffseq</option>
+      <option value="excel">Excel (tab delimited)</option>
+      <option value="feattable">FeatTable</option>
+      <option value="regions">Regions</option>
+      <option value="seqtable">SeqTable</option>
+      <option value="simple">SRS Simple</option>
+      <option value="srs">SRS</option>
+      <option value="table">Table</option>
+      <option value="tagseq">TagSeq</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="motif" />
   </outputs>
   <tests>
     <test>
@@ -45,19 +43,11 @@
       <param name="out_format1" value="excel"/>
       <output name="out_file1" file="emboss_sigcleave_out.tabular"/>
     </test>
-  </tests>
-  <code file="emboss_format_corrector.py" />
+  </tests>
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/sigcleave.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/sigcleave.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_sirna.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_sirna.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,92 +1,87 @@
-<tool id="EMBOSS: sirna89" name="sirna" version="5.0.0">
-  <description>Finds siRNA duplexes in mRNA</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>sirna -sequence $input1 -outfile $ofile1 -outseq $ofile2 -poliii $poliii -aa $aa -tt $tt -polybase $polybase -context $context -rformat2 $out_format1 -osformat3 $out_format2
-  -auto</command>
-  <inputs>
-    <param format="fasta" name="input1" type="data">
-      <label>Sequences</label>
-    </param>
-    <param name="poliii" type="select">
-      <label>Select only the 21 base probes that start with a purine (Pol III expression vectors)</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="aa" type="select">
-      <label>Select only those 23 base regions that start with AA</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="tt" type="select">
-      <label>Select only those 23 base regions that end with TT</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="polybase" type="select">
-      <label>Report more than those 23 base regions that have no repeat of 4 or more of any bases in a row</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="context" type="select">
-      <label>Displays the whole 23 bases of the region with the first two bases in brackets</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="out_format1" type="select">
-      <label>Output Report File Format</label>
-      <option value="table">Table</option>
-      <option value="embl">EMBL</option>
-      <option value="genbank">GENBANK</option>
-      <option value="gff">GFF</option>
-      <option value="pir">PIR</option>
-      <option value="swiss">SwissProt</option>
-      <option value="dbmotif">DbMotif</option>
-      <option value="diffseq">Diffseq</option>
-      <option value="excel">Excel (tab delimited)</option>
-      <option value="feattable">FeatTable</option>
-      <option value="motif">Motif</option>
-      <option value="regions">Regions</option>
-      <option value="seqtable">SeqTable</option>
-      <option value="simple">SRS Simple</option>
-      <option value="srs">SRS</option>
-      <option value="tagseq">TagSeq</option>
-    </param>
-    <param name="out_format2" type="select">
-      <label>Output Sequence File Format</label>
-      <option value="fasta">FASTA (m)</option>
-      <option value="acedb">ACeDB (m)</option>
-      <option value="asn1">ASN.1 (m)</option>
-      <option value="clustal">Clustal (m)</option>
-      <option value="codata">CODATA (m)</option>
-      <option value="embl">EMBL (m)</option>
-      <option value="fitch">Fitch (m)</option>
-      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
-      <option value="genbank">GENBANK (m)</option>
-      <option value="gff">GFF (m)</option>
-      <option value="hennig86">Hennig86 (m)</option>
-      <option value="ig">Intelligenetics (m)</option>
-      <option value="jackknifer">Jackknifer (m)</option>
-      <option value="jackknifernon">Jackknifernon (m)</option>
-      <option value="mega">Mega (m)</option>
-      <option value="meganon">Meganon (m)</option>
-      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
-      <option value="pir">NBRF (PIR) (m)</option>
-      <option value="ncbi">NCBI style FASTA (m)</option>
-      <option value="nexus">Nexus/PAUP (m)</option>
-      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
-      <option value="phylip">PHYLIP interleaved (m)</option>
-      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
-      <option value="selex">SELEX (m)</option>
-      <option value="staden">Staden (s)</option>
-      <option value="strider">DNA strider (m)</option>
-      <option value="swiss">SwisProt entry (m)</option>
-      <option value="text">Plain sequence (s)</option>
-      <option value="treecon">Treecon (m)</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="table" name="ofile1" />
-    <data format="fasta" name="ofile2" />
+<tool id="EMBOSS: sirna89" name="sirna" version="5.0.0">
+  <description>Finds siRNA duplexes in mRNA</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>sirna -sequence '$input1' -outfile '$ofile1' -outseq '$ofile2' -poliii $poliii -aa $aa -tt $tt -polybase $polybase -context $context -rformat2 $out_format1 -osformat3 $out_format2
+  -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="fasta" label="Sequences" />
+    <param name="poliii" type="select" label="Select only the 21 base probes that start with a purine (Pol III expression vectors)">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="aa" type="select" label="Select only those 23 base regions that start with AA">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="tt" type="select" label="Select only those 23 base regions that end with TT">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="polybase" type="select" label="Report more than those 23 base regions that have no repeat of 4 or more of any bases in a row">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="context" type="select" label="Displays the whole 23 bases of the region with the first two bases in brackets">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="out_format1" type="select" label="Output report file format">
+      <option value="table">Table</option>
+      <option value="embl">EMBL</option>
+      <option value="genbank">GENBANK</option>
+      <option value="gff">GFF</option>
+      <option value="pir">PIR</option>
+      <option value="swiss">SwissProt</option>
+      <option value="dbmotif">DbMotif</option>
+      <option value="diffseq">Diffseq</option>
+      <option value="excel">Excel (tab delimited)</option>
+      <option value="feattable">FeatTable</option>
+      <option value="motif">Motif</option>
+      <option value="regions">Regions</option>
+      <option value="seqtable">SeqTable</option>
+      <option value="simple">SRS Simple</option>
+      <option value="srs">SRS</option>
+      <option value="tagseq">TagSeq</option>
+    </param>
+    <param name="out_format2" type="select" label="Output sequence file format">
+      <option value="fasta">FASTA (m)</option>
+      <option value="acedb">ACeDB (m)</option>
+      <option value="asn1">ASN.1 (m)</option>
+      <option value="clustal">Clustal (m)</option>
+      <option value="codata">CODATA (m)</option>
+      <option value="embl">EMBL (m)</option>
+      <option value="fitch">Fitch (m)</option>
+      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
+      <option value="genbank">GENBANK (m)</option>
+      <option value="gff">GFF (m)</option>
+      <option value="hennig86">Hennig86 (m)</option>
+      <option value="ig">Intelligenetics (m)</option>
+      <option value="jackknifer">Jackknifer (m)</option>
+      <option value="jackknifernon">Jackknifernon (m)</option>
+      <option value="mega">Mega (m)</option>
+      <option value="meganon">Meganon (m)</option>
+      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
+      <option value="pir">NBRF (PIR) (m)</option>
+      <option value="ncbi">NCBI style FASTA (m)</option>
+      <option value="nexus">Nexus/PAUP (m)</option>
+      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
+      <option value="phylip">PHYLIP interleaved (m)</option>
+      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
+      <option value="selex">SELEX (m)</option>
+      <option value="staden">Staden (s)</option>
+      <option value="strider">DNA strider (m)</option>
+      <option value="swiss">SwisProt entry (m)</option>
+      <option value="text">Plain sequence (s)</option>
+      <option value="treecon">Treecon (m)</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="ofile1" format="table" />
+    <data name="ofile2" format="fasta" />
   </outputs>
   <tests>
     <test>
@@ -101,10 +96,8 @@
       <param name="out_format2" value="fasta"/>
       <output name="ofile2" file="emboss_sirna_out.fasta"/>
     </test>
-  </tests>
-  <code file="emboss_format_corrector.py" />
+  </tests>
   <help>
-
 .. class:: warningmark
 
 The input dataset needs to be sequences.
@@ -112,15 +105,8 @@
 -----
 
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/sirna.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/sirna.html
   </help>
+  <expand macro="citations" />
 </tool>
--- a/emboss_sixpack.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_sixpack.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,128 +1,108 @@
-<tool id="EMBOSS: sixpack90" name="sixpack" version="5.0.0">
+<tool id="EMBOSS: sixpack90" name="sixpack" version="5.0.0.1">
   <!-- tool adds file description and timestamp to output data -->
-  <description>Display a DNA sequence with 6-frame translation and ORFs</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>sixpack -sequence $input1 -outfile $ofile1 -outseq $ofile2 -table $table -firstorf $firstorf -lastorf $lastorf -mstart $mstart -reverse $reverse -orfminsize $orfminsize -uppercase
-  "$uppercase" -number $number -width "$width" -length "$length" -margin "$margin" -name $disp_name -description $description -offset "$offset" -html $html_out1 -osformat $out_format2 -auto</command>
-  <inputs>
-    <param format="fasta" name="input1" type="data">
-      <label>Sequences</label>
-    </param>
-    <param name="table" type="select">
-      <label>Code to use</label>
-      <option value="0">Standard</option>
-      <option value="1">Standard (with alternative initiation codons)</option>
-      <option value="2">Vertebrate Mitochondrial</option>
-      <option value="3">Yeast Mitochondrial</option>
-      <option value="4">Mold, Protozoan, Coelenterate Mitochondrial and Mycoplasma/Spiroplasma</option>
-      <option value="5">Invertebrate Mitochondrial</option>
-      <option value="6">Ciliate Macronuclear and Dasycladacean</option>
-      <option value="9">Echinoderm Mitochondrial</option>
-      <option value="10">Euplotid Nuclear</option>
-      <option value="11">Bacterial</option>
-      <option value="12">Alternative Yeast Nuclear</option>
-      <option value="13">Ascidian Mitochondrial</option>
-      <option value="14">Flatworm Mitochondrial</option>
-      <option value="15">Blepharisma Macronuclear</option>
-      <option value="16">Chlorophycean Mitochondrial</option>
-      <option value="21">Trematode Mitochondrial</option>
-      <option value="22">Scenedesmus obliquus</option>
-      <option value="23">Thraustochytrium Mitochondrial</option>
-    </param>
-    <param name="firstorf" type="select">
-      <label>Count the beginning of a sequence as a possible ORF</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="lastorf" type="select">
-      <label>Count the end of a sequence as a possible ORF</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="mstart" type="select">
-      <label>Displays only ORFs starting with an M</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="reverse" type="select">
-      <label>Display the translation of the DNA sequence in the 3 reverse frames</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="orfminsize" type="text" value="1">
-      <label>Minimum size of Open Reading Frames (ORFs) to display in the translations</label>
-    </param>
-    <param name="uppercase" type="text" value="">
-      <label>Regions to put in uppercase</label>
-    </param>
-    <param name="number" type="select">
-      <label>Number the sequence at the beginning and the end of each line</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="width" type="text" value="60">
-      <label>Number of nucleotides displayed on each line</label>
-    </param>
-    <param name="length" type="text" value="0">
-      <label>Line length of page</label>
-    </param>
-    <param name="margin" type="text" value="10">
-      <label>Margin around sequence for numbering</label>
-    </param>
-    <param name="disp_name" type="select">
-      <label>Display the ID name of the sequence</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="description" type="select">
-      <label>Display the description of the sequence</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="offset" type="text" value="1">
-      <label>Number from which you want the DNA sequence to be numbered</label>
-    </param>
-    <param name="html_out1" type="select">
-      <label>Format output as an HTML table</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="out_format2" type="select">
-      <label>Output Sequence File Format</label>
-      <option value="fasta">FASTA (m)</option>
-      <option value="acedb">ACeDB (m)</option>
-      <option value="asn1">ASN.1 (m)</option>
-      <option value="clustal">Clustal (m)</option>
-      <option value="codata">CODATA (m)</option>
-      <option value="embl">EMBL (m)</option>
-      <option value="fitch">Fitch (m)</option>
-      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
-      <option value="genbank">GENBANK (m)</option>
-      <option value="gff">GFF (m)</option>
-      <option value="hennig86">Hennig86 (m)</option>
-      <option value="ig">Intelligenetics (m)</option>
-      <option value="jackknifer">Jackknifer (m)</option>
-      <option value="jackknifernon">Jackknifernon (m)</option>
-      <option value="mega">Mega (m)</option>
-      <option value="meganon">Meganon (m)</option>
-      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
-      <option value="pir">NBRF (PIR) (m)</option>
-      <option value="ncbi">NCBI style FASTA (m)</option>
-      <option value="nexus">Nexus/PAUP (m)</option>
-      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
-      <option value="phylip">PHYLIP interleaved (m)</option>
-      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
-      <option value="selex">SELEX (m)</option>
-      <option value="staden">Staden (s)</option>
-      <option value="strider">DNA strider (m)</option>
-      <option value="swiss">SwisProt entry (m)</option>
-      <option value="text">Plain sequence (s)</option>
-      <option value="treecon">Treecon (m)</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="sixpack" name="ofile1" />
-    <data format="fasta" name="ofile2" />
+  <description>Display a DNA sequence with 6-frame translation and ORFs</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>sixpack -sequence '$input1' -outfile '$ofile1' -outseq '$ofile2' -table $table -firstorf $firstorf -lastorf $lastorf -mstart $mstart -reverse $reverse -orfminsize $orfminsize -uppercase
+  '$uppercase' -number $number -width $width -length $length -margin $margin -name $disp_name -description $description -offset $offset -html $html_out1 -osformat $out_format2 -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="fasta" label="Sequences" />
+    <param name="table" type="select" label="Code to use">
+      <option value="0">Standard</option>
+      <option value="1">Standard (with alternative initiation codons)</option>
+      <option value="2">Vertebrate Mitochondrial</option>
+      <option value="3">Yeast Mitochondrial</option>
+      <option value="4">Mold, Protozoan, Coelenterate Mitochondrial and Mycoplasma/Spiroplasma</option>
+      <option value="5">Invertebrate Mitochondrial</option>
+      <option value="6">Ciliate Macronuclear and Dasycladacean</option>
+      <option value="9">Echinoderm Mitochondrial</option>
+      <option value="10">Euplotid Nuclear</option>
+      <option value="11">Bacterial</option>
+      <option value="12">Alternative Yeast Nuclear</option>
+      <option value="13">Ascidian Mitochondrial</option>
+      <option value="14">Flatworm Mitochondrial</option>
+      <option value="15">Blepharisma Macronuclear</option>
+      <option value="16">Chlorophycean Mitochondrial</option>
+      <option value="21">Trematode Mitochondrial</option>
+      <option value="22">Scenedesmus obliquus</option>
+      <option value="23">Thraustochytrium Mitochondrial</option>
+    </param>
+    <param name="firstorf" type="select" label="Count the beginning of a sequence as a possible ORF">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="lastorf" type="select" label="Count the end of a sequence as a possible ORF">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="mstart" type="select" label="Displays only ORFs starting with an M">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="reverse" type="select" label="Display the translation of the DNA sequence in the 3 reverse frames">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="orfminsize" type="integer" value="1" label="Minimum size of Open Reading Frames (ORFs) to display in the translations" />
+    <param name="uppercase" type="text" value="" label="Regions to put in uppercase" />
+    <param name="number" type="select" label="Number the sequence at the beginning and the end of each line">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="width" type="integer" value="60" label="Number of nucleotides displayed on each line" />
+    <param name="length" type="integer" value="0" label="Line length of page" />
+    <param name="margin" type="integer" value="10" label="Margin around sequence for numbering" />
+    <param name="disp_name" type="select" label="Display the ID name of the sequence">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="description" type="select" label="Display the description of the sequence">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="offset" type="integer" value="1" label="Number from which you want the DNA sequence to be numbered" />
+    <param name="html_out1" type="select" label="Format output as an HTML table">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="out_format2" type="select" label="Output sequence file format">
+      <option value="fasta">FASTA (m)</option>
+      <option value="acedb">ACeDB (m)</option>
+      <option value="asn1">ASN.1 (m)</option>
+      <option value="clustal">Clustal (m)</option>
+      <option value="codata">CODATA (m)</option>
+      <option value="embl">EMBL (m)</option>
+      <option value="fitch">Fitch (m)</option>
+      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
+      <option value="genbank">GENBANK (m)</option>
+      <option value="gff">GFF (m)</option>
+      <option value="hennig86">Hennig86 (m)</option>
+      <option value="ig">Intelligenetics (m)</option>
+      <option value="jackknifer">Jackknifer (m)</option>
+      <option value="jackknifernon">Jackknifernon (m)</option>
+      <option value="mega">Mega (m)</option>
+      <option value="meganon">Meganon (m)</option>
+      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
+      <option value="pir">NBRF (PIR) (m)</option>
+      <option value="ncbi">NCBI style FASTA (m)</option>
+      <option value="nexus">Nexus/PAUP (m)</option>
+      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
+      <option value="phylip">PHYLIP interleaved (m)</option>
+      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
+      <option value="selex">SELEX (m)</option>
+      <option value="staden">Staden (s)</option>
+      <option value="strider">DNA strider (m)</option>
+      <option value="swiss">SwisProt entry (m)</option>
+      <option value="text">Plain sequence (s)</option>
+      <option value="treecon">Treecon (m)</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="ofile1" format="sixpack" />
+    <data name="ofile2" format="fasta" />
   </outputs>
 <!--    <tests>
     <test>
@@ -145,10 +125,8 @@
       <param name="out_format2" value="fasta"/>
       <output name="ofile2" file="emboss_sixpack_out.fasta"/>
     </test>
-  </tests> -->
-  <code file="emboss_format_corrector.py" />
+  </tests> -->
   <help>
-
 .. class:: warningmark
 
 The input dataset needs to be sequences.
@@ -156,15 +134,8 @@
 -----
 
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/sixpack.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/sixpack.html
   </help>
+  <expand macro="citations" />
 </tool>
--- a/emboss_skipseq.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_skipseq.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,67 +1,57 @@
-<tool id="EMBOSS: skipseq91" name="skipseq" version="5.0.0">
-  <description>Reads and writes sequences, skipping first few</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>skipseq -sequence $input1 -outseq $out_file1 -skip "$skip" -feature $feature -osformat2 $out_format1 -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>Sequences</label>
-    </param>
-    <param name="skip" type="text" value="0">
-      <label>Number of sequences to skip at start</label>
-    </param>
-    <param name="feature" type="select">
-      <label>Use feature information</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="out_format1" type="select">
-      <label>Output Sequence File Format</label>
-      <option value="fasta">FASTA (m)</option>
-      <option value="acedb">ACeDB (m)</option>
-      <option value="asn1">ASN.1 (m)</option>
-      <option value="clustal">Clustal (m)</option>
-      <option value="codata">CODATA (m)</option>
-      <option value="embl">EMBL (m)</option>
-      <option value="fitch">Fitch (m)</option>
-      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
-      <option value="genbank">GENBANK (m)</option>
-      <option value="gff">GFF (m)</option>
-      <option value="hennig86">Hennig86 (m)</option>
-      <option value="ig">Intelligenetics (m)</option>
-      <option value="jackknifer">Jackknifer (m)</option>
-      <option value="jackknifernon">Jackknifernon (m)</option>
-      <option value="mega">Mega (m)</option>
-      <option value="meganon">Meganon (m)</option>
-      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
-      <option value="pir">NBRF (PIR) (m)</option>
-      <option value="ncbi">NCBI style FASTA (m)</option>
-      <option value="nexus">Nexus/PAUP (m)</option>
-      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
-      <option value="phylip">PHYLIP interleaved (m)</option>
-      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
-      <option value="selex">SELEX (m)</option>
-      <option value="staden">Staden (s)</option>
-      <option value="strider">DNA strider (m)</option>
-      <option value="swiss">SwisProt entry (m)</option>
-      <option value="text">Plain sequence (s)</option>
-      <option value="treecon">Treecon (m)</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="fasta" name="out_file1" />
-  </outputs>
-  <code file="emboss_format_corrector.py" />
+<tool id="EMBOSS: skipseq91" name="skipseq" version="5.0.0.1">
+  <description>Reads and writes sequences, skipping first few</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>skipseq -sequence '$input1' -outseq '$out_file1' -skip $skip -feature $feature -osformat2 $out_format1 -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="Sequences" />
+    <param name="skip" type="integer" value="0" label="Number of sequences to skip at start" />
+    <param name="feature" type="select" label="Use feature information">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="out_format1" type="select" label="Output sequence file format">
+      <option value="fasta">FASTA (m)</option>
+      <option value="acedb">ACeDB (m)</option>
+      <option value="asn1">ASN.1 (m)</option>
+      <option value="clustal">Clustal (m)</option>
+      <option value="codata">CODATA (m)</option>
+      <option value="embl">EMBL (m)</option>
+      <option value="fitch">Fitch (m)</option>
+      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
+      <option value="genbank">GENBANK (m)</option>
+      <option value="gff">GFF (m)</option>
+      <option value="hennig86">Hennig86 (m)</option>
+      <option value="ig">Intelligenetics (m)</option>
+      <option value="jackknifer">Jackknifer (m)</option>
+      <option value="jackknifernon">Jackknifernon (m)</option>
+      <option value="mega">Mega (m)</option>
+      <option value="meganon">Meganon (m)</option>
+      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
+      <option value="pir">NBRF (PIR) (m)</option>
+      <option value="ncbi">NCBI style FASTA (m)</option>
+      <option value="nexus">Nexus/PAUP (m)</option>
+      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
+      <option value="phylip">PHYLIP interleaved (m)</option>
+      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
+      <option value="selex">SELEX (m)</option>
+      <option value="staden">Staden (s)</option>
+      <option value="strider">DNA strider (m)</option>
+      <option value="swiss">SwisProt entry (m)</option>
+      <option value="text">Plain sequence (s)</option>
+      <option value="treecon">Treecon (m)</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="fasta" />
+  </outputs>
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/skipseq.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/skipseq.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_splitter.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_splitter.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,57 +1,53 @@
-<tool id="EMBOSS: splitter92" name="splitter" version="5.0.0">
-  <description>Split a sequence into (overlapping) smaller sequences</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>splitter -sequence $input1 -outseq $out_file1 -size "$size" -overlap "$overlap" -addoverlap $addoverlap -osformat2 $out_format1 -auto</command>
-  <inputs>
-    <param format="fasta" name="input1" type="data">
-      <label>Sequences</label>
-    </param>
-    <param name="size" type="text" value="10000">
-      <label>Size to split at</label>
-    </param>
-    <param name="overlap" type="text" value="0">
-      <label>Overlap between split sequences</label>
-    </param>
-    <param name="addoverlap" type="select">
-      <label>Add overlap to size</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="out_format1" type="select">
-      <label>Output Sequence File Format</label>
-      <option value="fasta">FASTA (m)</option>
-      <option value="acedb">ACeDB (m)</option>
-      <option value="asn1">ASN.1 (m)</option>
-      <option value="clustal">Clustal (m)</option>
-      <option value="codata">CODATA (m)</option>
-      <option value="embl">EMBL (m)</option>
-      <option value="fitch">Fitch (m)</option>
-      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
-      <option value="genbank">GENBANK (m)</option>
-      <option value="gff">GFF (m)</option>
-      <option value="hennig86">Hennig86 (m)</option>
-      <option value="ig">Intelligenetics (m)</option>
-      <option value="jackknifer">Jackknifer (m)</option>
-      <option value="jackknifernon">Jackknifernon (m)</option>
-      <option value="mega">Mega (m)</option>
-      <option value="meganon">Meganon (m)</option>
-      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
-      <option value="pir">NBRF (PIR) (m)</option>
-      <option value="ncbi">NCBI style FASTA (m)</option>
-      <option value="nexus">Nexus/PAUP (m)</option>
-      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
-      <option value="phylip">PHYLIP interleaved (m)</option>
-      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
-      <option value="selex">SELEX (m)</option>
-      <option value="staden">Staden (s)</option>
-      <option value="strider">DNA strider (m)</option>
-      <option value="swiss">SwisProt entry (m)</option>
-      <option value="text">Plain sequence (s)</option>
-      <option value="treecon">Treecon (m)</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="fasta" name="out_file1" />
+<tool id="EMBOSS: splitter92" name="splitter" version="5.0.0.1">
+  <description>Split a sequence into (overlapping) smaller sequences</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>splitter -sequence '$input1' -outseq '$out_file1' -size $size -overlap $overlap -addoverlap $addoverlap -osformat2 $out_format1 -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="fasta" label="Sequences" />
+    <param name="size" type="integer" value="10000" label="Size to split at" />
+    <param name="overlap" type="integer" value="0" label="Overlap between split sequences" />
+    <param name="addoverlap" type="select" label="Add overlap to size">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="out_format1" type="select" label="Output sequence file format">
+      <option value="fasta">FASTA (m)</option>
+      <option value="acedb">ACeDB (m)</option>
+      <option value="asn1">ASN.1 (m)</option>
+      <option value="clustal">Clustal (m)</option>
+      <option value="codata">CODATA (m)</option>
+      <option value="embl">EMBL (m)</option>
+      <option value="fitch">Fitch (m)</option>
+      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
+      <option value="genbank">GENBANK (m)</option>
+      <option value="gff">GFF (m)</option>
+      <option value="hennig86">Hennig86 (m)</option>
+      <option value="ig">Intelligenetics (m)</option>
+      <option value="jackknifer">Jackknifer (m)</option>
+      <option value="jackknifernon">Jackknifernon (m)</option>
+      <option value="mega">Mega (m)</option>
+      <option value="meganon">Meganon (m)</option>
+      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
+      <option value="pir">NBRF (PIR) (m)</option>
+      <option value="ncbi">NCBI style FASTA (m)</option>
+      <option value="nexus">Nexus/PAUP (m)</option>
+      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
+      <option value="phylip">PHYLIP interleaved (m)</option>
+      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
+      <option value="selex">SELEX (m)</option>
+      <option value="staden">Staden (s)</option>
+      <option value="strider">DNA strider (m)</option>
+      <option value="swiss">SwisProt entry (m)</option>
+      <option value="text">Plain sequence (s)</option>
+      <option value="treecon">Treecon (m)</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="fasta" />
   </outputs>
   <tests>
     <test>
@@ -62,10 +58,8 @@
       <param name="out_format1" value="fasta"/>
       <output name="out_file1" file="emboss_splitter_out.fasta"/>
     </test>
-  </tests>
-  <code file="emboss_format_corrector.py" />
+  </tests>
   <help>
-
 .. class:: warningmark
 
 The input dataset needs to be sequences.
@@ -73,15 +67,8 @@
 -----
 
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/splitter.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/splitter.html
   </help>
+  <expand macro="citations" />
 </tool>
--- a/emboss_supermatcher.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_supermatcher.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,47 +1,38 @@
-<tool id="EMBOSS: supermatcher95" name="supermatcher" version="5.0.0">
+<tool id="EMBOSS: supermatcher95" name="supermatcher" version="5.0.0.1">
   <!-- puts file information in output report -->
-  <description>Match large sequences against one or more other sequences</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>supermatcher -asequence $input1 -bsequence $input2 -gapopen "$gapopen" -gapextend "$gapextend" -width "$width" -wordlen "$wordlen" -outfile $ofile1 -errorfile $ofile2 -aformat3
-  $out_format1 -auto</command>
-  <inputs>
-    <param format="fasta" name="input1" type="data">
-      <label>Large sequences</label>
-    </param>
-    <param format="data" name="input2" type="data">
-      <label>Sequences to match</label>
-    </param>
-    <param name="gapopen" type="text" value="10.0">
-      <label>Gap opening penalty</label>
-    </param>
-    <param name="gapextend" type="text" value="0.5">
-      <label>Gap extension penalty</label>
-    </param>
-    <param name="width" type="text" value="16">
-      <label>Alignment width</label>
-    </param>
-    <param name="wordlen" type="text" value="6">
-      <label>Word length for initial matching</label>
-    </param>
-    <param name="out_format1" type="select">
-      <label>Output Alignment File Format</label>
-      <option value="simple">Simple (m)</option>
-      <option value="fasta">FASTA (m)</option>
-      <option value="msf">MSF (m)</option>
-      <option value="srs">SRS (m)</option>
-      <option value="pair">Pair (p)</option>
-      <option value="markx0">Markx0 (p)</option>
-      <option value="markx1">Markx1 (p)</option>
-      <option value="markx2">Markx2 (p)</option>
-      <option value="markx3">Markx3 (p)</option>
-      <option value="markx10">Markx10 (p)</option>
-      <option value="srspair">SRS pair (p)</option>
-      <option value="score">Score (p)</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="simple" name="ofile1" />
-    <data format="supermatcher" name="ofile2" />
+  <description>Match large sequences against one or more other sequences</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>supermatcher -asequence '$input1' -bsequence '$input2' -gapopen $gapopen -gapextend $gapextend -width $width -wordlen $wordlen -outfile '$ofile1' -errorfile '$ofile2' -aformat3
+  $out_format1 -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="fasta" label="Large sequences" />
+    <param name="input2" type="data" format="data" label="Sequences to match" />
+    <param name="gapopen" type="float" value="10.0" label="Gap opening penalty" />
+    <param name="gapextend" type="float" value="0.5" label="Gap extension penalty" />
+    <param name="width" type="integer" value="16" label="Alignment width" />
+    <param name="wordlen" type="integer" value="6" label="Word length for initial matching" />
+    <param name="out_format1" type="select" label="Output alignment file format">
+      <option value="simple">Simple (m)</option>
+      <option value="fasta">FASTA (m)</option>
+      <option value="msf">MSF (m)</option>
+      <option value="srs">SRS (m)</option>
+      <option value="pair">Pair (p)</option>
+      <option value="markx0">Markx0 (p)</option>
+      <option value="markx1">Markx1 (p)</option>
+      <option value="markx2">Markx2 (p)</option>
+      <option value="markx3">Markx3 (p)</option>
+      <option value="markx10">Markx10 (p)</option>
+      <option value="srspair">SRS pair (p)</option>
+      <option value="score">Score (p)</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="ofile1" format="simple" />
+    <data name="ofile2" format="supermatcher" />
   </outputs>
 <!--    <tests>
     <test>
@@ -54,19 +45,11 @@
       <param name="out_format1" value="fasta"/>
       <output name="ofile1" file="emboss_supermatcher_out.fasta"/>
     </test>
-  </tests> -->
-  <code file="emboss_format_corrector.py" />
+  </tests> -->
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/supermatcher.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/supermatcher.html
   </help>
+  <expand macro="citations" />
 </tool>
--- a/emboss_syco.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_syco.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,182 +1,177 @@
-<tool id="EMBOSS: syco96" name="syco" version="5.0.0">
+<tool id="EMBOSS: syco96" name="syco" version="5.0.0.1">
   <!-- graphics output -->
-  <description>Synonymous codon usage Gribskov statistic plot</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command interpreter="perl">emboss_single_outputfile_wrapper.pl syco -sequence $input1 -graph png -goutfile $ofile1 -outfile $ofile2 -cfile $cfile -window "$window" -uncommon $uncommon -minimum "$minimum"
-  -auto</command>
-  <inputs>
-    <param format="fasta" name="input1" type="data">
-      <label>Sequence</label>
-    </param>
-    <param name="cfile" type="select">
-      <label>Codon Usage File</label>
-      <option value="Ehum.cut">Ehum.cut</option>
-      <option value="Eyeastcai.cut">Eyeastcai.cut</option>
-      <option value="Eacc.cut">Eacc.cut</option>
-      <option value="Eadenovirus5.cut">Eadenovirus5.cut</option>
-      <option value="Eadenovirus7.cut">Eadenovirus7.cut</option>
-      <option value="Eaidlav.cut">Eaidlav.cut</option>
-      <option value="Eanasp.cut">Eanasp.cut</option>
-      <option value="Eani.cut">Eani.cut</option>
-      <option value="Eani_h.cut">Eani_h.cut</option>
-      <option value="Eanidmit.cut">Eanidmit.cut</option>
-      <option value="Easn.cut">Easn.cut</option>
-      <option value="Eath.cut">Eath.cut</option>
-      <option value="Eatu.cut">Eatu.cut</option>
-      <option value="Eavi.cut">Eavi.cut</option>
-      <option value="Ebja.cut">Ebja.cut</option>
-      <option value="Ebly.cut">Ebly.cut</option>
-      <option value="Ebme.cut">Ebme.cut</option>
-      <option value="Ebmo.cut">Ebmo.cut</option>
-      <option value="Ebna.cut">Ebna.cut</option>
-      <option value="Ebov.cut">Ebov.cut</option>
-      <option value="Ebovsp.cut">Ebovsp.cut</option>
-      <option value="Ebst.cut">Ebst.cut</option>
-      <option value="Ebsu.cut">Ebsu.cut</option>
-      <option value="Ebsu_h.cut">Ebsu_h.cut</option>
-      <option value="Ecac.cut">Ecac.cut</option>
-      <option value="Ecal.cut">Ecal.cut</option>
-      <option value="Eccr.cut">Eccr.cut</option>
-      <option value="Ecel.cut">Ecel.cut</option>
-      <option value="Echi.cut">Echi.cut</option>
-      <option value="Echicken.cut">Echicken.cut</option>
-      <option value="Echisp.cut">Echisp.cut</option>
-      <option value="Echk.cut">Echk.cut</option>
-      <option value="Echmp.cut">Echmp.cut</option>
-      <option value="Echnt.cut">Echnt.cut</option>
-      <option value="Echos.cut">Echos.cut</option>
-      <option value="Echzm.cut">Echzm.cut</option>
-      <option value="Echzmrubp.cut">Echzmrubp.cut</option>
-      <option value="Ecpx.cut">Ecpx.cut</option>
-      <option value="Ecre.cut">Ecre.cut</option>
-      <option value="Ecrisp.cut">Ecrisp.cut</option>
-      <option value="Ectr.cut">Ectr.cut</option>
-      <option value="Edayhoff.cut">Edayhoff.cut</option>
-      <option value="Eddi.cut">Eddi.cut</option>
-      <option value="Eddi_h.cut">Eddi_h.cut</option>
-      <option value="Edog.cut">Edog.cut</option>
-      <option value="Edro.cut">Edro.cut</option>
-      <option value="Edro_h.cut">Edro_h.cut</option>
-      <option value="Edrosophila.cut">Edrosophila.cut</option>
-      <option value="Eeca.cut">Eeca.cut</option>
-      <option value="Eeco.cut">Eeco.cut</option>
-      <option value="Eeco_h.cut">Eeco_h.cut</option>
-      <option value="Eecoli.cut">Eecoli.cut</option>
-      <option value="Ef1.cut">Ef1.cut</option>
-      <option value="Efish.cut">Efish.cut</option>
-      <option value="Efmdvpolyp.cut">Efmdvpolyp.cut</option>
-      <option value="Eham.cut">Eham.cut</option>
-      <option value="Ehha.cut">Ehha.cut</option>
-      <option value="Ehin.cut">Ehin.cut</option>
-      <option value="Ehma.cut">Ehma.cut</option>
-      <option value="Ehuman.cut">Ehuman.cut</option>
-      <option value="Ekla.cut">Ekla.cut</option>
-      <option value="Ekpn.cut">Ekpn.cut</option>
-      <option value="Ella.cut">Ella.cut</option>
-      <option value="Emac.cut">Emac.cut</option>
-      <option value="Emaize.cut">Emaize.cut</option>
-      <option value="Emam_h.cut">Emam_h.cut</option>
-      <option value="Emixlg.cut">Emixlg.cut</option>
-      <option value="Emouse.cut">Emouse.cut</option>
-      <option value="Emsa.cut">Emsa.cut</option>
-      <option value="Emse.cut">Emse.cut</option>
-      <option value="Emta.cut">Emta.cut</option>
-      <option value="Emtu.cut">Emtu.cut</option>
-      <option value="Emus.cut">Emus.cut</option>
-      <option value="Emussp.cut">Emussp.cut</option>
-      <option value="Emva.cut">Emva.cut</option>
-      <option value="Emze.cut">Emze.cut</option>
-      <option value="Emzecp.cut">Emzecp.cut</option>
-      <option value="Encr.cut">Encr.cut</option>
-      <option value="Eneu.cut">Eneu.cut</option>
-      <option value="Engo.cut">Engo.cut</option>
-      <option value="Eoncsp.cut">Eoncsp.cut</option>
-      <option value="Epae.cut">Epae.cut</option>
-      <option value="Epea.cut">Epea.cut</option>
-      <option value="Epet.cut">Epet.cut</option>
-      <option value="Epfa.cut">Epfa.cut</option>
-      <option value="Ephix174.cut">Ephix174.cut</option>
-      <option value="Ephv.cut">Ephv.cut</option>
-      <option value="Ephy.cut">Ephy.cut</option>
-      <option value="Epig.cut">Epig.cut</option>
-      <option value="Epolyomaa2.cut">Epolyomaa2.cut</option>
-      <option value="Epombe.cut">Epombe.cut</option>
-      <option value="Epombecai.cut">Epombecai.cut</option>
-      <option value="Epot.cut">Epot.cut</option>
-      <option value="Eppu.cut">Eppu.cut</option>
-      <option value="Epse.cut">Epse.cut</option>
-      <option value="Epsy.cut">Epsy.cut</option>
-      <option value="Epvu.cut">Epvu.cut</option>
-      <option value="Erab.cut">Erab.cut</option>
-      <option value="Erabbit.cut">Erabbit.cut</option>
-      <option value="Erabsp.cut">Erabsp.cut</option>
-      <option value="Erat.cut">Erat.cut</option>
-      <option value="Eratsp.cut">Eratsp.cut</option>
-      <option value="Erca.cut">Erca.cut</option>
-      <option value="Erhm.cut">Erhm.cut</option>
-      <option value="Eric.cut">Eric.cut</option>
-      <option value="Erle.cut">Erle.cut</option>
-      <option value="Erme.cut">Erme.cut</option>
-      <option value="Ersp.cut">Ersp.cut</option>
-      <option value="Esalsp.cut">Esalsp.cut</option>
-      <option value="Esau.cut">Esau.cut</option>
-      <option value="Esco.cut">Esco.cut</option>
-      <option value="Esgi.cut">Esgi.cut</option>
-      <option value="Eshp.cut">Eshp.cut</option>
-      <option value="Eshpsp.cut">Eshpsp.cut</option>
-      <option value="Esli.cut">Esli.cut</option>
-      <option value="Eslm.cut">Eslm.cut</option>
-      <option value="Esma.cut">Esma.cut</option>
-      <option value="Esmi.cut">Esmi.cut</option>
-      <option value="Esmu.cut">Esmu.cut</option>
-      <option value="Esoy.cut">Esoy.cut</option>
-      <option value="Espi.cut">Espi.cut</option>
-      <option value="Espn.cut">Espn.cut</option>
-      <option value="Espo.cut">Espo.cut</option>
-      <option value="Espo_h.cut">Espo_h.cut</option>
-      <option value="Espu.cut">Espu.cut</option>
-      <option value="Esta.cut">Esta.cut</option>
-      <option value="Esty.cut">Esty.cut</option>
-      <option value="Esus.cut">Esus.cut</option>
-      <option value="Esv40.cut">Esv40.cut</option>
-      <option value="Esyhsp.cut">Esyhsp.cut</option>
-      <option value="Esynsp.cut">Esynsp.cut</option>
-      <option value="Etbr.cut">Etbr.cut</option>
-      <option value="Etcr.cut">Etcr.cut</option>
-      <option value="Eter.cut">Eter.cut</option>
-      <option value="Etetsp.cut">Etetsp.cut</option>
-      <option value="Etob.cut">Etob.cut</option>
-      <option value="Etobcp.cut">Etobcp.cut</option>
-      <option value="Etom.cut">Etom.cut</option>
-      <option value="Etrb.cut">Etrb.cut</option>
-      <option value="Evco.cut">Evco.cut</option>
-      <option value="Ewht.cut">Ewht.cut</option>
-      <option value="Exel.cut">Exel.cut</option>
-      <option value="Exenopus.cut">Exenopus.cut</option>
-      <option value="Eyeast.cut">Eyeast.cut</option>
-      <option value="Eyen.cut">Eyen.cut</option>
-      <option value="Eysc.cut">Eysc.cut</option>
-      <option value="Eysc_h.cut">Eysc_h.cut</option>
-      <option value="Eyscmt.cut">Eyscmt.cut</option>
-      <option value="Eysp.cut">Eysp.cut</option>
-      <option value="Ezebrafish.cut">Ezebrafish.cut</option>
-      <option value="Ezma.cut">Ezma.cut</option>
-    </param>
-    <param name="window" type="text" value="30">
-      <label>Averaging window</label>
-    </param>
-    <param name="uncommon" type="select">
-      <label>Show common codon usage</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="minimum" type="text" value="0.15">
-      <label>Minimum value for a common codon</label>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="png" name="ofile1" />
-    <data format="syco" name="ofile2" />
+  <description>Synonymous codon usage Gribskov statistic plot</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <command>perl '$__tool_directory__/emboss_single_outputfile_wrapper.pl' syco -sequence '$input1' -graph png -goutfile '$ofile1' -outfile '$ofile2' -cfile $cfile -window $window -uncommon $uncommon -minimum $minimum
+  -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="fasta" label="Sequence" />
+    <param name="cfile" type="select" label="Codon usage file">
+      <option value="Ehum.cut">Ehum.cut</option>
+      <option value="Eyeastcai.cut">Eyeastcai.cut</option>
+      <option value="Eacc.cut">Eacc.cut</option>
+      <option value="Eadenovirus5.cut">Eadenovirus5.cut</option>
+      <option value="Eadenovirus7.cut">Eadenovirus7.cut</option>
+      <option value="Eaidlav.cut">Eaidlav.cut</option>
+      <option value="Eanasp.cut">Eanasp.cut</option>
+      <option value="Eani.cut">Eani.cut</option>
+      <option value="Eani_h.cut">Eani_h.cut</option>
+      <option value="Eanidmit.cut">Eanidmit.cut</option>
+      <option value="Easn.cut">Easn.cut</option>
+      <option value="Eath.cut">Eath.cut</option>
+      <option value="Eatu.cut">Eatu.cut</option>
+      <option value="Eavi.cut">Eavi.cut</option>
+      <option value="Ebja.cut">Ebja.cut</option>
+      <option value="Ebly.cut">Ebly.cut</option>
+      <option value="Ebme.cut">Ebme.cut</option>
+      <option value="Ebmo.cut">Ebmo.cut</option>
+      <option value="Ebna.cut">Ebna.cut</option>
+      <option value="Ebov.cut">Ebov.cut</option>
+      <option value="Ebovsp.cut">Ebovsp.cut</option>
+      <option value="Ebst.cut">Ebst.cut</option>
+      <option value="Ebsu.cut">Ebsu.cut</option>
+      <option value="Ebsu_h.cut">Ebsu_h.cut</option>
+      <option value="Ecac.cut">Ecac.cut</option>
+      <option value="Ecal.cut">Ecal.cut</option>
+      <option value="Eccr.cut">Eccr.cut</option>
+      <option value="Ecel.cut">Ecel.cut</option>
+      <option value="Echi.cut">Echi.cut</option>
+      <option value="Echicken.cut">Echicken.cut</option>
+      <option value="Echisp.cut">Echisp.cut</option>
+      <option value="Echk.cut">Echk.cut</option>
+      <option value="Echmp.cut">Echmp.cut</option>
+      <option value="Echnt.cut">Echnt.cut</option>
+      <option value="Echos.cut">Echos.cut</option>
+      <option value="Echzm.cut">Echzm.cut</option>
+      <option value="Echzmrubp.cut">Echzmrubp.cut</option>
+      <option value="Ecpx.cut">Ecpx.cut</option>
+      <option value="Ecre.cut">Ecre.cut</option>
+      <option value="Ecrisp.cut">Ecrisp.cut</option>
+      <option value="Ectr.cut">Ectr.cut</option>
+      <option value="Edayhoff.cut">Edayhoff.cut</option>
+      <option value="Eddi.cut">Eddi.cut</option>
+      <option value="Eddi_h.cut">Eddi_h.cut</option>
+      <option value="Edog.cut">Edog.cut</option>
+      <option value="Edro.cut">Edro.cut</option>
+      <option value="Edro_h.cut">Edro_h.cut</option>
+      <option value="Edrosophila.cut">Edrosophila.cut</option>
+      <option value="Eeca.cut">Eeca.cut</option>
+      <option value="Eeco.cut">Eeco.cut</option>
+      <option value="Eeco_h.cut">Eeco_h.cut</option>
+      <option value="Eecoli.cut">Eecoli.cut</option>
+      <option value="Ef1.cut">Ef1.cut</option>
+      <option value="Efish.cut">Efish.cut</option>
+      <option value="Efmdvpolyp.cut">Efmdvpolyp.cut</option>
+      <option value="Eham.cut">Eham.cut</option>
+      <option value="Ehha.cut">Ehha.cut</option>
+      <option value="Ehin.cut">Ehin.cut</option>
+      <option value="Ehma.cut">Ehma.cut</option>
+      <option value="Ehuman.cut">Ehuman.cut</option>
+      <option value="Ekla.cut">Ekla.cut</option>
+      <option value="Ekpn.cut">Ekpn.cut</option>
+      <option value="Ella.cut">Ella.cut</option>
+      <option value="Emac.cut">Emac.cut</option>
+      <option value="Emaize.cut">Emaize.cut</option>
+      <option value="Emam_h.cut">Emam_h.cut</option>
+      <option value="Emixlg.cut">Emixlg.cut</option>
+      <option value="Emouse.cut">Emouse.cut</option>
+      <option value="Emsa.cut">Emsa.cut</option>
+      <option value="Emse.cut">Emse.cut</option>
+      <option value="Emta.cut">Emta.cut</option>
+      <option value="Emtu.cut">Emtu.cut</option>
+      <option value="Emus.cut">Emus.cut</option>
+      <option value="Emussp.cut">Emussp.cut</option>
+      <option value="Emva.cut">Emva.cut</option>
+      <option value="Emze.cut">Emze.cut</option>
+      <option value="Emzecp.cut">Emzecp.cut</option>
+      <option value="Encr.cut">Encr.cut</option>
+      <option value="Eneu.cut">Eneu.cut</option>
+      <option value="Engo.cut">Engo.cut</option>
+      <option value="Eoncsp.cut">Eoncsp.cut</option>
+      <option value="Epae.cut">Epae.cut</option>
+      <option value="Epea.cut">Epea.cut</option>
+      <option value="Epet.cut">Epet.cut</option>
+      <option value="Epfa.cut">Epfa.cut</option>
+      <option value="Ephix174.cut">Ephix174.cut</option>
+      <option value="Ephv.cut">Ephv.cut</option>
+      <option value="Ephy.cut">Ephy.cut</option>
+      <option value="Epig.cut">Epig.cut</option>
+      <option value="Epolyomaa2.cut">Epolyomaa2.cut</option>
+      <option value="Epombe.cut">Epombe.cut</option>
+      <option value="Epombecai.cut">Epombecai.cut</option>
+      <option value="Epot.cut">Epot.cut</option>
+      <option value="Eppu.cut">Eppu.cut</option>
+      <option value="Epse.cut">Epse.cut</option>
+      <option value="Epsy.cut">Epsy.cut</option>
+      <option value="Epvu.cut">Epvu.cut</option>
+      <option value="Erab.cut">Erab.cut</option>
+      <option value="Erabbit.cut">Erabbit.cut</option>
+      <option value="Erabsp.cut">Erabsp.cut</option>
+      <option value="Erat.cut">Erat.cut</option>
+      <option value="Eratsp.cut">Eratsp.cut</option>
+      <option value="Erca.cut">Erca.cut</option>
+      <option value="Erhm.cut">Erhm.cut</option>
+      <option value="Eric.cut">Eric.cut</option>
+      <option value="Erle.cut">Erle.cut</option>
+      <option value="Erme.cut">Erme.cut</option>
+      <option value="Ersp.cut">Ersp.cut</option>
+      <option value="Esalsp.cut">Esalsp.cut</option>
+      <option value="Esau.cut">Esau.cut</option>
+      <option value="Esco.cut">Esco.cut</option>
+      <option value="Esgi.cut">Esgi.cut</option>
+      <option value="Eshp.cut">Eshp.cut</option>
+      <option value="Eshpsp.cut">Eshpsp.cut</option>
+      <option value="Esli.cut">Esli.cut</option>
+      <option value="Eslm.cut">Eslm.cut</option>
+      <option value="Esma.cut">Esma.cut</option>
+      <option value="Esmi.cut">Esmi.cut</option>
+      <option value="Esmu.cut">Esmu.cut</option>
+      <option value="Esoy.cut">Esoy.cut</option>
+      <option value="Espi.cut">Espi.cut</option>
+      <option value="Espn.cut">Espn.cut</option>
+      <option value="Espo.cut">Espo.cut</option>
+      <option value="Espo_h.cut">Espo_h.cut</option>
+      <option value="Espu.cut">Espu.cut</option>
+      <option value="Esta.cut">Esta.cut</option>
+      <option value="Esty.cut">Esty.cut</option>
+      <option value="Esus.cut">Esus.cut</option>
+      <option value="Esv40.cut">Esv40.cut</option>
+      <option value="Esyhsp.cut">Esyhsp.cut</option>
+      <option value="Esynsp.cut">Esynsp.cut</option>
+      <option value="Etbr.cut">Etbr.cut</option>
+      <option value="Etcr.cut">Etcr.cut</option>
+      <option value="Eter.cut">Eter.cut</option>
+      <option value="Etetsp.cut">Etetsp.cut</option>
+      <option value="Etob.cut">Etob.cut</option>
+      <option value="Etobcp.cut">Etobcp.cut</option>
+      <option value="Etom.cut">Etom.cut</option>
+      <option value="Etrb.cut">Etrb.cut</option>
+      <option value="Evco.cut">Evco.cut</option>
+      <option value="Ewht.cut">Ewht.cut</option>
+      <option value="Exel.cut">Exel.cut</option>
+      <option value="Exenopus.cut">Exenopus.cut</option>
+      <option value="Eyeast.cut">Eyeast.cut</option>
+      <option value="Eyen.cut">Eyen.cut</option>
+      <option value="Eysc.cut">Eysc.cut</option>
+      <option value="Eysc_h.cut">Eysc_h.cut</option>
+      <option value="Eyscmt.cut">Eyscmt.cut</option>
+      <option value="Eysp.cut">Eysp.cut</option>
+      <option value="Ezebrafish.cut">Ezebrafish.cut</option>
+      <option value="Ezma.cut">Ezma.cut</option>
+    </param>
+    <param name="window" type="integer" value="30" label="Averaging window" />
+    <param name="uncommon" type="select" label="Show common codon usage">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="minimum" type="float" value="0.15" label="Minimum value for a common codon" />
+  </inputs>
+  <outputs>
+    <data name="ofile1" format="png" />
+    <data name="ofile2" format="syco" />
   </outputs>
  <!--   <tests>
     <test>
@@ -187,19 +182,11 @@
       <param name="minimum" value="0.15"/>
       <output name="ofile2" file="emboss_syco_out.syco"/>
     </test>
-  </tests> -->
+  </tests> -->
   <help>
-
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/syco.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/syco.html
   </help>
+  <expand macro="citations" />
 </tool>
--- a/emboss_tcode.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_tcode.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,52 +1,41 @@
-<tool id="EMBOSS: tcode97" name="tcode" version="5.0.0">
-  <description>Fickett TESTCODE statistic to identify protein-coding DNA</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>tcode -sequence $input1 -outfile $out_file1 -window "$window" -step "$step" -rformat $out_format1 -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>Sequence</label>
-    </param>
-    <param name="window" type="text" value="200">
-      <label>Window size</label>
-    </param>
-    <param name="step" type="text" value="3">
-      <label>Step size</label>
-    </param>
-    <param name="out_format1" type="select">
-      <label>Output Report File Format</label>
-      <option value="table">Table</option>
-      <option value="embl">EMBL</option>
-      <option value="genbank">GENBANK</option>
-      <option value="gff">GFF</option>
-      <option value="pir">PIR</option>
-      <option value="swiss">SwissProt</option>
-      <option value="dbmotif">DbMotif</option>
-      <option value="diffseq">Diffseq</option>
-      <option value="excel">Excel (tab delimited)</option>
-      <option value="feattable">FeatTable</option>
-      <option value="motif">Motif</option>
-      <option value="regions">Regions</option>
-      <option value="seqtable">SeqTable</option>
-      <option value="simple">SRS Simple</option>
-      <option value="srs">SRS</option>
-      <option value="tagseq">TagSeq</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="table" name="out_file1" />
-  </outputs>
-  <code file="emboss_format_corrector.py" />
+<tool id="EMBOSS: tcode97" name="tcode" version="5.0.0.1">
+  <description>Fickett TESTCODE statistic to identify protein-coding DNA</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>tcode -sequence '$input1' -outfile '$out_file1' -window $window -step $step -rformat $out_format1 -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="Sequence" />
+    <param name="window" type="integer" value="200" label="Window size" />
+    <param name="step" type="integer" value="3" label="Step size" />
+    <param name="out_format1" type="select" label="Output report file format">
+      <option value="table">Table</option>
+      <option value="embl">EMBL</option>
+      <option value="genbank">GENBANK</option>
+      <option value="gff">GFF</option>
+      <option value="pir">PIR</option>
+      <option value="swiss">SwissProt</option>
+      <option value="dbmotif">DbMotif</option>
+      <option value="diffseq">Diffseq</option>
+      <option value="excel">Excel (tab delimited)</option>
+      <option value="feattable">FeatTable</option>
+      <option value="motif">Motif</option>
+      <option value="regions">Regions</option>
+      <option value="seqtable">SeqTable</option>
+      <option value="simple">SRS Simple</option>
+      <option value="srs">SRS</option>
+      <option value="tagseq">TagSeq</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="table" />
+  </outputs>
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/tcode.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/tcode.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_textsearch.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_textsearch.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,66 +1,51 @@
-<tool id="EMBOSS: textsearch98" name="textsearch" version="5.0.0">
-  <description>Search sequence documentation. Slow, use SRS and Entrez!</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>textsearch -sequence $input1 -outfile $out_file1 -pattern "$pattern" -casesensitive -heading $heading -usa $usa -accession $accession -name $search_name -description $description -html
-  $html_out1 -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>Sequence</label>
-    </param>
-    <param name="pattern" type="text" value="">
-      <label>Pattern to search for</label>
-    </param>
-    <param name="casesensitive" type="select">
-      <label>Do a case-sensitive search</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="heading" type="select">
-      <label>Display column headings</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="usa" type="select">
-      <label>Display the USA of the sequence</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="accession" type="select">
-      <label>Display accession column</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="search_name" type="select">
-      <label>Display name column</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="description" type="select">
-      <label>Display description column</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="html_out1" type="select">
-      <label>Format output as an HTML table</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="textsearch" name="out_file1" />
-  </outputs>
-  <code file="emboss_format_corrector.py" />
+<tool id="EMBOSS: textsearch98" name="textsearch" version="5.0.0">
+  <description>Search sequence documentation. Slow, use SRS and Entrez!</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>textsearch -sequence '$input1' -outfile '$out_file1' -pattern '$pattern' -casesensitive -heading $heading -usa $usa -accession $accession -name $search_name -description $description -html
+  $html_out1 -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="Sequence" />
+    <param name="pattern" type="text" value="" label="Pattern to search for" />
+    <param name="casesensitive" type="select" label="Do a case-sensitive search">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="heading" type="select" label="Display column headings">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="usa" type="select" label="Display the USA of the sequence">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="accession" type="select" label="Display accession column">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="search_name" type="select" label="Display name column">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="description" type="select" label="Display description column">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="html_out1" type="select" label="Format output as an HTML table">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="textsearch" />
+  </outputs>
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/textsearch.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/textsearch.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_tmap.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_tmap.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,47 +1,40 @@
-<tool id="EMBOSS: tmap99" name="tmap" version="5.0.0">
-  <description>Displays membrane spanning regions</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command interpreter="perl">emboss_single_outputfile_wrapper.pl tmap -sequences $input1 -outfile $out_file1 -goutfile $out_file2 -graph png -rformat $out_format1 -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>Sequence</label>
-    </param>
-    <param name="out_format1" type="select">
-      <label>Output Report File Format</label>
-      <option value="seqtable ">SeqTable</option>
-      <option value="embl">EMBL</option>
-      <option value="genbank">GENBANK</option>
-      <option value="gff">GFF</option>
-      <option value="pir">PIR</option>
-      <option value="swiss">SwissProt</option>
-      <option value="dbmotif">DbMotif</option>
-      <option value="diffseq">Diffseq</option>
-      <option value="excel">Excel (tab delimited)</option>
-      <option value="feattable">FeatTable</option>
-      <option value="motif">Motif</option>
-      <option value="regions">Regions</option>
-      <option value="simple">SRS Simple</option>
-      <option value="srs">SRS</option>
-      <option value="table">Table</option>
-      <option value="tagseq">TagSeq</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="seqtable" name="out_file1" />
-    <data format="png" name="out_file2" />
-  </outputs>
-  <code file="emboss_format_corrector.py" />
+<tool id="EMBOSS: tmap99" name="tmap" version="5.0.0">
+  <description>Displays membrane spanning regions</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>perl '$__tool_directory__/emboss_single_outputfile_wrapper.pl' tmap -sequences '$input1' -outfile '$out_file1' -goutfile '$out_file2' -graph png -rformat $out_format1 -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="Sequence" />
+    <param name="out_format1" type="select" label="Output report file format">
+      <option value="seqtable ">SeqTable</option>
+      <option value="embl">EMBL</option>
+      <option value="genbank">GENBANK</option>
+      <option value="gff">GFF</option>
+      <option value="pir">PIR</option>
+      <option value="swiss">SwissProt</option>
+      <option value="dbmotif">DbMotif</option>
+      <option value="diffseq">Diffseq</option>
+      <option value="excel">Excel (tab delimited)</option>
+      <option value="feattable">FeatTable</option>
+      <option value="motif">Motif</option>
+      <option value="regions">Regions</option>
+      <option value="simple">SRS Simple</option>
+      <option value="srs">SRS</option>
+      <option value="table">Table</option>
+      <option value="tagseq">TagSeq</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="seqtable" />
+    <data name="out_file2" format="png" />
+  </outputs>
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/tmap.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/tmap.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_tranalign.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_tranalign.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,70 +1,68 @@
-<tool id="EMBOSS: tranalign100" name="tranalign" version="5.0.0">
-  <description>Align nucleic coding regions given the aligned proteins</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>tranalign -asequence $input1 -bsequence $input2 -outseq $out_file1 -table $table -osformat3 $out_format1 -auto</command>
-  <inputs>
-    <param format="fasta" name="input1" type="data">
-      <label>Nucleic Sequences</label>
-    </param>
-    <param format="data" name="input2" type="data">
-      <label>Protein Sequences</label>
-    </param>
-    <param name="table" type="select">
-      <label>Code to use</label>
-      <option value="0">Standard</option>
-      <option value="1">Standard (with alternative initiation codons)</option>
-      <option value="2">Vertebrate Mitochondrial</option>
-      <option value="3">Yeast Mitochondrial</option>
-      <option value="4">Mold, Protozoan, Coelenterate Mitochondrial and Mycoplasma/Spiroplasma</option>
-      <option value="5">Invertebrate Mitochondrial</option>
-      <option value="6">Ciliate Macronuclear and Dasycladacean</option>
-      <option value="9">Echinoderm Mitochondrial</option>
-      <option value="10">Euplotid Nuclear</option>
-      <option value="11">Bacterial</option>
-      <option value="12">Alternative Yeast Nuclear</option>
-      <option value="13">Ascidian Mitochondrial</option>
-      <option value="14">Flatworm Mitochondrial</option>
-      <option value="15">Blepharisma Macronuclear</option>
-      <option value="16">Chlorophycean Mitochondrial</option>
-      <option value="21">Trematode Mitochondrial</option>
-      <option value="22">Scenedesmus obliquus</option>
-      <option value="23">Thraustochytrium Mitochondrial</option>
-    </param>
-    <param name="out_format1" type="select">
-      <label>Output Sequence File Format</label>
-      <option value="fasta">FASTA (m)</option>
-      <option value="acedb">ACeDB (m)</option>
-      <option value="asn1">ASN.1 (m)</option>
-      <option value="clustal">Clustal (m)</option>
-      <option value="codata">CODATA (m)</option>
-      <option value="embl">EMBL (m)</option>
-      <option value="fitch">Fitch (m)</option>
-      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
-      <option value="genbank">GENBANK (m)</option>
-      <option value="gff">GFF (m)</option>
-      <option value="hennig86">Hennig86 (m)</option>
-      <option value="ig">Intelligenetics (m)</option>
-      <option value="jackknifer">Jackknifer (m)</option>
-      <option value="jackknifernon">Jackknifernon (m)</option>
-      <option value="mega">Mega (m)</option>
-      <option value="meganon">Meganon (m)</option>
-      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
-      <option value="pir">NBRF (PIR) (m)</option>
-      <option value="ncbi">NCBI style FASTA (m)</option>
-      <option value="nexus">Nexus/PAUP (m)</option>
-      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
-      <option value="phylip">PHYLIP interleaved (m)</option>
-      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
-      <option value="selex">SELEX (m)</option>
-      <option value="staden">Staden (s)</option>
-      <option value="strider">DNA strider (m)</option>
-      <option value="swiss">SwisProt entry (m)</option>
-      <option value="text">Plain sequence (s)</option>
-      <option value="treecon">Treecon (m)</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="fasta" name="out_file1" />
+<tool id="EMBOSS: tranalign100" name="tranalign" version="5.0.0">
+  <description>Align nucleic coding regions given the aligned proteins</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>tranalign -asequence '$input1' -bsequence '$input2' -outseq '$out_file1' -table $table -osformat3 $out_format1 -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="fasta" label="Nucleic sequences" />
+    <param name="input2" type="data" format="data" label="Protein sequences" />
+    <param name="table" type="select" label="Code to use">
+      <option value="0">Standard</option>
+      <option value="1">Standard (with alternative initiation codons)</option>
+      <option value="2">Vertebrate Mitochondrial</option>
+      <option value="3">Yeast Mitochondrial</option>
+      <option value="4">Mold, Protozoan, Coelenterate Mitochondrial and Mycoplasma/Spiroplasma</option>
+      <option value="5">Invertebrate Mitochondrial</option>
+      <option value="6">Ciliate Macronuclear and Dasycladacean</option>
+      <option value="9">Echinoderm Mitochondrial</option>
+      <option value="10">Euplotid Nuclear</option>
+      <option value="11">Bacterial</option>
+      <option value="12">Alternative Yeast Nuclear</option>
+      <option value="13">Ascidian Mitochondrial</option>
+      <option value="14">Flatworm Mitochondrial</option>
+      <option value="15">Blepharisma Macronuclear</option>
+      <option value="16">Chlorophycean Mitochondrial</option>
+      <option value="21">Trematode Mitochondrial</option>
+      <option value="22">Scenedesmus obliquus</option>
+      <option value="23">Thraustochytrium Mitochondrial</option>
+    </param>
+    <param name="out_format1" type="select" label="Output sequence file format">
+      <option value="fasta">FASTA (m)</option>
+      <option value="acedb">ACeDB (m)</option>
+      <option value="asn1">ASN.1 (m)</option>
+      <option value="clustal">Clustal (m)</option>
+      <option value="codata">CODATA (m)</option>
+      <option value="embl">EMBL (m)</option>
+      <option value="fitch">Fitch (m)</option>
+      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
+      <option value="genbank">GENBANK (m)</option>
+      <option value="gff">GFF (m)</option>
+      <option value="hennig86">Hennig86 (m)</option>
+      <option value="ig">Intelligenetics (m)</option>
+      <option value="jackknifer">Jackknifer (m)</option>
+      <option value="jackknifernon">Jackknifernon (m)</option>
+      <option value="mega">Mega (m)</option>
+      <option value="meganon">Meganon (m)</option>
+      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
+      <option value="pir">NBRF (PIR) (m)</option>
+      <option value="ncbi">NCBI style FASTA (m)</option>
+      <option value="nexus">Nexus/PAUP (m)</option>
+      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
+      <option value="phylip">PHYLIP interleaved (m)</option>
+      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
+      <option value="selex">SELEX (m)</option>
+      <option value="staden">Staden (s)</option>
+      <option value="strider">DNA strider (m)</option>
+      <option value="swiss">SwisProt entry (m)</option>
+      <option value="text">Plain sequence (s)</option>
+      <option value="treecon">Treecon (m)</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="fasta" />
   </outputs>
   <tests>
     <test>
@@ -74,19 +72,11 @@
       <param name="out_format1" value="fasta"/>
       <output name="out_file1" file="emboss_tranalign_out.fasta"/>
     </test>
-  </tests>
-  <code file="emboss_format_corrector.py" />
+  </tests>
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/tranalign.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/tranalign.html
   </help>
+  <expand macro="citations" />
 </tool>
--- a/emboss_transeq.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_transeq.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,145 +1,130 @@
-<tool id="EMBOSS: transeq101" name="transeq" version="5.0.0">
-  <description>Translate nucleic acid sequences</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command><![CDATA[
-    transeq 
-      -sequence '$input1' 
-      -outseq '$out_file1' 
-      -frame $frame 
-      -table $table
-      #if str($regions).strip():
-        -regions "$regions"
-      #end if
-      -trim $trim 
-      -clean $clean 
-      -alternative $alternative 
-      -osformat2 '$out_format1' 
-      -auto
-  ]]>
-  </command>
-  <inputs>
-    <param format="fasta" name="input1" type="data">
-      <label>Sequences</label>
-    </param>
-    <param name="frame" type="select">
-      <label>Frame(s) to translate</label>
-      <option value="1">Frame 1</option>
-      <option value="2">Frame 2</option>
-      <option value="3">Frame 3</option>
-      <option value="F">Forward three frames</option>
-      <option value="-1">Frame -1</option>
-      <option value="-2">Frame -2</option>
-      <option value="-3">Frame -3</option>
-      <option value="R">Reverse three frames</option>
-      <option value="6">All six frames</option>
-    </param>
-    <param name="table" type="select">
-      <label>Code to use</label>
-      <option value="0">Standard</option>
-      <option value="1">Standard (with alternative initiation codons)</option>
-      <option value="2">Vertebrate Mitochondrial</option>
-      <option value="3">Yeast Mitochondrial</option>
-      <option value="4">Mold, Protozoan, Coelenterate Mitochondrial and Mycoplasma/Spiroplasma</option>
-      <option value="5">Invertebrate Mitochondrial</option>
-      <option value="6">Ciliate Macronuclear and Dasycladacean</option>
-      <option value="9">Echinoderm Mitochondrial</option>
-      <option value="10">Euplotid Nuclear</option>
-      <option value="11">Bacterial</option>
-      <option value="12">Alternative Yeast Nuclear</option>
-      <option value="13">Ascidian Mitochondrial</option>
-      <option value="14">Flatworm Mitochondrial</option>
-      <option value="15">Blepharisma Macronuclear</option>
-      <option value="16">Chlorophycean Mitochondrial</option>
-      <option value="21">Trematode Mitochondrial</option>
-      <option value="22">Scenedesmus obliquus</option>
-      <option value="23">Thraustochytrium Mitochondrial</option>
-    </param>
-    <param name="regions" type="text" value="">
-      <label>Regions to translate</label>
-    </param>
-    <param name="trim" type="select">
-      <label>Remove all 'X' and '*' characters from the right end of the translation</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="clean" type="select">
-      <label>Change all STOP codon positions from the '*' character to 'X'</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="alternative" type="select">
-      <label>Define frame '-1' as using the set of codons starting with the last codon of the sequence</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="out_format1" type="select">
-      <label>Output Sequence File Format</label>
-      <option value="fasta">FASTA (m)</option>
-      <option value="acedb">ACeDB (m)</option>
-      <option value="asn1">ASN.1 (m)</option>
-      <option value="clustal">Clustal (m)</option>
-      <option value="codata">CODATA (m)</option>
-      <option value="embl">EMBL (m)</option>
-      <option value="fitch">Fitch (m)</option>
-      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
-      <option value="genbank">GENBANK (m)</option>
-      <option value="gff">GFF (m)</option>
-      <option value="hennig86">Hennig86 (m)</option>
-      <option value="ig">Intelligenetics (m)</option>
-      <option value="jackknifer">Jackknifer (m)</option>
-      <option value="jackknifernon">Jackknifernon (m)</option>
-      <option value="mega">Mega (m)</option>
-      <option value="meganon">Meganon (m)</option>
-      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
-      <option value="pir">NBRF (PIR) (m)</option>
-      <option value="ncbi">NCBI style FASTA (m)</option>
-      <option value="nexus">Nexus/PAUP (m)</option>
-      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
-      <option value="phylip">PHYLIP interleaved (m)</option>
-      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
-      <option value="selex">SELEX (m)</option>
-      <option value="staden">Staden (s)</option>
-      <option value="strider">DNA strider (m)</option>
-      <option value="swiss">SwisProt entry (m)</option>
-      <option value="text">Plain sequence (s)</option>
-      <option value="treecon">Treecon (m)</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="fasta" name="out_file1" />
-  </outputs>
-  <tests>
-    <test>
-      <param name="input1" value="2.fasta"/>
-      <param name="frame" value="1"/>
-      <param name="table" value="0"/>
-      <param name="regions" value=""/>
-      <param name="trim" value="no"/>
-      <param name="clean" value="no"/>
-      <param name="alternative" value="no"/>
-      <param name="out_format1" value="fasta"/>
-      <output name="out_file1" file="emboss_transeq_out.fasta"/>
-    </test>
-  </tests>
-  <code file="emboss_format_corrector.py" />
-  <help>
-
-.. class:: warningmark
-
-The input dataset needs to be sequences.
-
------
-
-    You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/transeq.html
-
-------
-
-**Citation**
-
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
-  </help>
-</tool>
+<tool id="EMBOSS: transeq101" name="transeq" version="5.0.0">
+  <description>Translate nucleic acid sequences</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command><![CDATA[
+    transeq 
+      -sequence '$input1' 
+      -outseq '$out_file1' 
+      -frame $frame 
+      -table $table
+      #if str($regions).strip():
+        -regions '$regions'
+      #end if
+      -trim $trim 
+      -clean $clean 
+      -alternative $alternative 
+      -osformat2 '$out_format1' 
+      -auto
+  ]]>
+  </command>
+  <inputs>
+    <param name="input1" type="data" format="fasta" label="Sequences" />
+    <param name="frame" type="select" label="Frame(s) to translate">
+      <option value="1">Frame 1</option>
+      <option value="2">Frame 2</option>
+      <option value="3">Frame 3</option>
+      <option value="F">Forward three frames</option>
+      <option value="-1">Frame -1</option>
+      <option value="-2">Frame -2</option>
+      <option value="-3">Frame -3</option>
+      <option value="R">Reverse three frames</option>
+      <option value="6">All six frames</option>
+    </param>
+    <param name="table" type="select" label="Code to use">
+      <option value="0">Standard</option>
+      <option value="1">Standard (with alternative initiation codons)</option>
+      <option value="2">Vertebrate Mitochondrial</option>
+      <option value="3">Yeast Mitochondrial</option>
+      <option value="4">Mold, Protozoan, Coelenterate Mitochondrial and Mycoplasma/Spiroplasma</option>
+      <option value="5">Invertebrate Mitochondrial</option>
+      <option value="6">Ciliate Macronuclear and Dasycladacean</option>
+      <option value="9">Echinoderm Mitochondrial</option>
+      <option value="10">Euplotid Nuclear</option>
+      <option value="11">Bacterial</option>
+      <option value="12">Alternative Yeast Nuclear</option>
+      <option value="13">Ascidian Mitochondrial</option>
+      <option value="14">Flatworm Mitochondrial</option>
+      <option value="15">Blepharisma Macronuclear</option>
+      <option value="16">Chlorophycean Mitochondrial</option>
+      <option value="21">Trematode Mitochondrial</option>
+      <option value="22">Scenedesmus obliquus</option>
+      <option value="23">Thraustochytrium Mitochondrial</option>
+    </param>
+    <param name="regions" type="text" value="" label="Regions to translate" />
+    <param name="trim" type="select" label="Remove all 'X' and '*' characters from the right end of the translation">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="clean" type="select" label="Change all STOP codon positions from the '*' character to 'X'">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="alternative" type="select" label="Define frame '-1' as using the set of codons starting with the last codon of the sequence">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="out_format1" type="select" label="Output sequence file format">
+      <option value="fasta">FASTA (m)</option>
+      <option value="acedb">ACeDB (m)</option>
+      <option value="asn1">ASN.1 (m)</option>
+      <option value="clustal">Clustal (m)</option>
+      <option value="codata">CODATA (m)</option>
+      <option value="embl">EMBL (m)</option>
+      <option value="fitch">Fitch (m)</option>
+      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
+      <option value="genbank">GENBANK (m)</option>
+      <option value="gff">GFF (m)</option>
+      <option value="hennig86">Hennig86 (m)</option>
+      <option value="ig">Intelligenetics (m)</option>
+      <option value="jackknifer">Jackknifer (m)</option>
+      <option value="jackknifernon">Jackknifernon (m)</option>
+      <option value="mega">Mega (m)</option>
+      <option value="meganon">Meganon (m)</option>
+      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
+      <option value="pir">NBRF (PIR) (m)</option>
+      <option value="ncbi">NCBI style FASTA (m)</option>
+      <option value="nexus">Nexus/PAUP (m)</option>
+      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
+      <option value="phylip">PHYLIP interleaved (m)</option>
+      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
+      <option value="selex">SELEX (m)</option>
+      <option value="staden">Staden (s)</option>
+      <option value="strider">DNA strider (m)</option>
+      <option value="swiss">SwisProt entry (m)</option>
+      <option value="text">Plain sequence (s)</option>
+      <option value="treecon">Treecon (m)</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="fasta" />
+  </outputs>
+  <tests>
+    <test>
+      <param name="input1" value="2.fasta"/>
+      <param name="frame" value="1"/>
+      <param name="table" value="0"/>
+      <param name="regions" value=""/>
+      <param name="trim" value="no"/>
+      <param name="clean" value="no"/>
+      <param name="alternative" value="no"/>
+      <param name="out_format1" value="fasta"/>
+      <output name="out_file1" file="emboss_transeq_out.fasta"/>
+    </test>
+  </tests>
+  <help>
+.. class:: warningmark
+
+The input dataset needs to be sequences.
+
+-----
+
+    You can view the original documentation here_.
+
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/transeq.html
+  </help>
+  <expand macro="citations" />
+</tool>
--- a/emboss_trimest.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_trimest.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,68 +1,62 @@
-<tool id="EMBOSS: trimest102" name="trimest" version="5.0.0">
-  <description>Trim poly-A tails off EST sequences</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>trimest -sequence $input1 -outseq $out_file1 -minlength "$minlength" -mismatches "$mismatches" -reverse $reverse -tolower $tolower -fiveprime $fiveprime -osformat2 $out_format1
-  -auto</command>
-  <inputs>
-    <param format="fasta" name="input1" type="data">
-      <label>Sequences</label>
-    </param>
-    <param name="minlength" type="text" value="4">
-      <label>Minimum length that a poly-A (or poly-T) tail must have before it is removed</label>
-    </param>
-    <param name="mismatches" type="text" value="1">
-      <label>Number of fewer mismatched non-A bases in a poly-A tail</label>
-    </param>
-    <param name="reverse" type="select">
-      <label>Change the sequence to the forward sense when it is written out</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="tolower" type="select">
-      <label>Mask poly-A by converting to lowercase</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="fiveprime" type="select">
-      <label>Inspect 5' end of the sequence for poly-T tails</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="out_format1" type="select">
-      <label>Output Sequence File Format</label>
-      <option value="fasta">FASTA (m)</option>
-      <option value="acedb">ACeDB (m)</option>
-      <option value="asn1">ASN.1 (m)</option>
-      <option value="clustal">Clustal (m)</option>
-      <option value="codata">CODATA (m)</option>
-      <option value="embl">EMBL (m)</option>
-      <option value="fitch">Fitch (m)</option>
-      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
-      <option value="genbank">GENBANK (m)</option>
-      <option value="gff">GFF (m)</option>
-      <option value="hennig86">Hennig86 (m)</option>
-      <option value="ig">Intelligenetics (m)</option>
-      <option value="jackknifer">Jackknifer (m)</option>
-      <option value="jackknifernon">Jackknifernon (m)</option>
-      <option value="mega">Mega (m)</option>
-      <option value="meganon">Meganon (m)</option>
-      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
-      <option value="pir">NBRF (PIR) (m)</option>
-      <option value="ncbi">NCBI style FASTA (m)</option>
-      <option value="nexus">Nexus/PAUP (m)</option>
-      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
-      <option value="phylip">PHYLIP interleaved (m)</option>
-      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
-      <option value="selex">SELEX (m)</option>
-      <option value="staden">Staden (s)</option>
-      <option value="strider">DNA strider (m)</option>
-      <option value="swiss">SwisProt entry (m)</option>
-      <option value="text">Plain sequence (s)</option>
-      <option value="treecon">Treecon (m)</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="fasta" name="out_file1" />
+<tool id="EMBOSS: trimest102" name="trimest" version="5.0.0.1">
+  <description>Trim poly-A tails off EST sequences</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>trimest -sequence '$input1' -outseq '$out_file1' -minlength $minlength -mismatches $mismatches -reverse $reverse -tolower $tolower -fiveprime $fiveprime -osformat2 $out_format1
+  -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="fasta" label="Sequences" />
+    <param name="minlength" type="integer" value="4" label="Minimum length that a poly-A (or poly-T) tail must have before it is removed" />
+    <param name="mismatches" type="integer" value="1" label="Number of fewer mismatched non-A bases in a poly-A tail" />
+    <param name="reverse" type="select" label="Change the sequence to the forward sense when it is written out">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="tolower" type="select" label="Mask poly-A by converting to lowercase">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="fiveprime" type="select" label="Inspect 5' end of the sequence for poly-T tails">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="out_format1" type="select" label="Output sequence file format">
+      <option value="fasta">FASTA (m)</option>
+      <option value="acedb">ACeDB (m)</option>
+      <option value="asn1">ASN.1 (m)</option>
+      <option value="clustal">Clustal (m)</option>
+      <option value="codata">CODATA (m)</option>
+      <option value="embl">EMBL (m)</option>
+      <option value="fitch">Fitch (m)</option>
+      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
+      <option value="genbank">GENBANK (m)</option>
+      <option value="gff">GFF (m)</option>
+      <option value="hennig86">Hennig86 (m)</option>
+      <option value="ig">Intelligenetics (m)</option>
+      <option value="jackknifer">Jackknifer (m)</option>
+      <option value="jackknifernon">Jackknifernon (m)</option>
+      <option value="mega">Mega (m)</option>
+      <option value="meganon">Meganon (m)</option>
+      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
+      <option value="pir">NBRF (PIR) (m)</option>
+      <option value="ncbi">NCBI style FASTA (m)</option>
+      <option value="nexus">Nexus/PAUP (m)</option>
+      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
+      <option value="phylip">PHYLIP interleaved (m)</option>
+      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
+      <option value="selex">SELEX (m)</option>
+      <option value="staden">Staden (s)</option>
+      <option value="strider">DNA strider (m)</option>
+      <option value="swiss">SwisProt entry (m)</option>
+      <option value="text">Plain sequence (s)</option>
+      <option value="treecon">Treecon (m)</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="fasta" />
   </outputs>
   <tests>
     <test>
@@ -75,10 +69,8 @@
       <param name="out_format1" value="fasta"/>
       <output name="out_file1" file="emboss_trimest_out.fasta"/>
     </test>
-  </tests>
-  <code file="emboss_format_corrector.py" />
+  </tests>
   <help>
-
 .. class:: warningmark
 
 The input dataset needs to be sequences.
@@ -86,15 +78,8 @@
 -----
 
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/trimest.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/trimest.html
   </help>
+  <expand macro="citations" />
 </tool>
--- a/emboss_trimseq.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_trimseq.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,72 +1,65 @@
-<tool id="EMBOSS: trimseq103" name="trimseq" version="5.0.0">
-  <description>Trim ambiguous bits off the ends of sequences</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>trimseq -sequence $input1 -outseq $out_file1 -window "$window" -percent "$percent" -strict $strict -star $star -left $left -right $right -osformat2 $out_format1 -auto</command>
-  <inputs>
-    <param format="fasta" name="input1" type="data">
-      <label>Sequences</label>
-    </param>
-    <param name="window" type="text" value="1">
-      <label>Window size</label>
-    </param>
-    <param name="percent" type="text" value="100.0">
-      <label>Threshold of the percentage ambiguity</label>
-    </param>
-    <param name="strict" type="select">
-      <label>Trim all ambiguity codes</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="star" type="select">
-      <label>In protein sequences, trim off not only X's, but also the *'s</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="left" type="select">
-      <label>Trim at the start</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="right" type="select">
-      <label>Trim at the end</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="out_format1" type="select">
-      <label>Output Sequence File Format</label>
-      <option value="fasta">FASTA (m)</option>
-      <option value="acedb">ACeDB (m)</option>
-      <option value="asn1">ASN.1 (m)</option>
-      <option value="clustal">Clustal (m)</option>
-      <option value="codata">CODATA (m)</option>
-      <option value="embl">EMBL (m)</option>
-      <option value="fitch">Fitch (m)</option>
-      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
-      <option value="genbank">GENBANK (m)</option>
-      <option value="gff">GFF (m)</option>
-      <option value="hennig86">Hennig86 (m)</option>
-      <option value="ig">Intelligenetics (m)</option>
-      <option value="jackknifer">Jackknifer (m)</option>
-      <option value="jackknifernon">Jackknifernon (m)</option>
-      <option value="mega">Mega (m)</option>
-      <option value="meganon">Meganon (m)</option>
-      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
-      <option value="pir">NBRF (PIR) (m)</option>
-      <option value="ncbi">NCBI style FASTA (m)</option>
-      <option value="nexus">Nexus/PAUP (m)</option>
-      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
-      <option value="phylip">PHYLIP interleaved (m)</option>
-      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
-      <option value="selex">SELEX (m)</option>
-      <option value="staden">Staden (s)</option>
-      <option value="strider">DNA strider (m)</option>
-      <option value="swiss">SwisProt entry (m)</option>
-      <option value="text">Plain sequence (s)</option>
-      <option value="treecon">Treecon (m)</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="fasta" name="out_file1" />
+<tool id="EMBOSS: trimseq103" name="trimseq" version="5.0.0.1">
+  <description>Trim ambiguous bits off the ends of sequences</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>trimseq -sequence '$input1' -outseq '$out_file1' -window $window -percent $percent -strict $strict -star $star -left $left -right $right -osformat2 $out_format1 -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="fasta" label="Sequences" />
+    <param name="window" type="integer" value="1" label="Window size" />
+    <param name="percent" type="float" value="100.0" label="Threshold of the percentage ambiguity" />
+    <param name="strict" type="select" label="Trim all ambiguity codes">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="star" type="select" label="In protein sequences, trim off not only X's, but also the *'s">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="left" type="select" label="Trim at the start">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="right" type="select" label="Trim at the end">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="out_format1" type="select" label="Output sequence file format">
+      <option value="fasta">FASTA (m)</option>
+      <option value="acedb">ACeDB (m)</option>
+      <option value="asn1">ASN.1 (m)</option>
+      <option value="clustal">Clustal (m)</option>
+      <option value="codata">CODATA (m)</option>
+      <option value="embl">EMBL (m)</option>
+      <option value="fitch">Fitch (m)</option>
+      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
+      <option value="genbank">GENBANK (m)</option>
+      <option value="gff">GFF (m)</option>
+      <option value="hennig86">Hennig86 (m)</option>
+      <option value="ig">Intelligenetics (m)</option>
+      <option value="jackknifer">Jackknifer (m)</option>
+      <option value="jackknifernon">Jackknifernon (m)</option>
+      <option value="mega">Mega (m)</option>
+      <option value="meganon">Meganon (m)</option>
+      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
+      <option value="pir">NBRF (PIR) (m)</option>
+      <option value="ncbi">NCBI style FASTA (m)</option>
+      <option value="nexus">Nexus/PAUP (m)</option>
+      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
+      <option value="phylip">PHYLIP interleaved (m)</option>
+      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
+      <option value="selex">SELEX (m)</option>
+      <option value="staden">Staden (s)</option>
+      <option value="strider">DNA strider (m)</option>
+      <option value="swiss">SwisProt entry (m)</option>
+      <option value="text">Plain sequence (s)</option>
+      <option value="treecon">Treecon (m)</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="fasta" />
   </outputs>
   <tests>
     <test>
@@ -80,10 +73,8 @@
       <param name="out_format1" value="fasta"/>
       <output name="out_file1" file="emboss_trimseq_out.fasta"/>
     </test>
-  </tests>
-  <code file="emboss_format_corrector.py" />
+  </tests>
   <help>
-
 .. class:: warningmark 
 
 The input dataset needs to be sequences. 
@@ -91,15 +82,8 @@
 ----- 
 
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/trimseq.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/trimseq.html
   </help>
+  <expand macro="citations" />
 </tool>
--- a/emboss_twofeat.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_twofeat.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,138 +1,94 @@
-<tool id="EMBOSS: twofeat104" name="twofeat" version="5.0.0">
-  <description>Finds neighbouring pairs of features in sequences</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>twofeat -sequence $input1 -outfile $out_file1 -atype "$atype" -btype "$btype" -minrange "$minrange" -maxrange "$maxrange" -asource "$asource" -asense $asense -aminscore "$aminscore"
-  -amaxscore "$amaxscore" -atag "$atag" -avalue "$avalue" -bsource "$bsource" -bsense "$bsense" -bminscore "$bminscore" -bmaxscore "$bmaxscore" -btag "$btag" -bvalue "$bvalue" -overlap $overlap
-  -rangetype $rangetype -sense $sense -order $order -twoout $twoout -typeout "$typeout" -rformat2 $out_format1 -auto</command>
-  <inputs>
-    <param format="data" name="input1" type="data">
-      <label>Sequences</label>
-    </param>
-    <param name="atype" type="text" value="*">
-      <label>Feature type you wish to allow. Feature 1</label>
-    </param>
-    <param name="btype" type="text" value="*">
-      <label>Feature type you wish to allow. Feature 2</label>
-    </param>
-    <param name="minrange" type="text" value="0">
-      <label>Minimun range</label>
-    </param>
-    <param name="maxrange" type="text" value="0">
-      <label>Maximum range</label>
-    </param>
-    <param name="asource" type="text" value="*">
-      <label>Feature source 1</label>
-    </param>
-    <param name="asense" type="select">
-      <label>Feature sense 1</label>
-      <option value="0">Any sense</option>
-      <option value="+">Forward sense</option>
-      <option value="-">Reverse sense</option>
-    </param>
-    <param name="aminscore" type="text" value="0.0">
-      <label>Feature 1 minimum score</label>
-    </param>
-    <param name="amaxscore" type="text" value="0.0">
-      <label>Feature1 maxiumum score</label>
-    </param>
-    <param name="atag" type="text" value="*">
-      <label>Feature 1 tag</label>
-    </param>
-    <param name="avalue" type="text" value="*">
-      <label>Tag 1 value</label>
-    </param>
-    <param name="bsource" type="text" value="*">
-      <label>Feature 2 source</label>
-    </param>
-    <param name="bsense" type="select">
-      <label>Feature 2 sense</label>
-      <option value="0">Any sense</option>
-      <option value="+">Forward sense</option>
-      <option value="-">Reverse sense</option>
-    </param>
-    <param name="bminscore" type="text" value="0.0">
-      <label>Feature 2 miniumum score</label>
-    </param>
-    <param name="bmaxscore" type="text" value="0.0">
-      <label>Feature 2 maximum score</label>
-    </param>
-    <param name="btag" type="text" value="*">
-      <label>Feature 2 tag</label>
-    </param>
-    <param name="bvalue" type="text" value="*">
-      <label>Feature 2 tag value</label>
-    </param>
-    <param name="overlap" type="select">
-      <label>opverlaps allowed</label>
-      <option value="A">Any</option>
-      <option value="O">Overlap required but not within</option>
-      <option value="NO">No overlaps are allowed</option>
-      <option value="NW:">Overlap required but not within</option>
-      <option value="AW">A must be all within B</option>
-      <option value="BW">B must be all within A</option>
-    </param>
-    <param name="rangetype" type="select">
-      <label>How to determine range</label>
-      <option value="N">From nearest ends</option>
-      <option value="L">From left ends</option>
-      <option value="R">From right ends</option>
-      <option value="F">From furthest ends</option>
-    </param>
-    <param name="sense" type="select">
-      <label>Required sense</label>
-      <option value="A">Any sense</option>
-      <option value="S">Same sense</option>
-      <option value="O">Opposite sense</option>
-    </param>
-    <param name="order" type="select">
-      <label>Required order of the two features</label>
-      <option value="A">Any</option>
-      <option value="AB">Feature A then feature B</option>
-      <option value="BA">Feature B then feature A</option>
-    </param>
-    <param name="twoout" type="select">
-      <label>Write out the two features themselves</label>
-      <option value="no">No</option>
-      <option value="yes">Yes</option>
-    </param>
-    <param name="typeout" type="text" value="misc_feature">
-      <label>New feature type</label>
-    </param>
-    <param name="out_format1" type="select">
-      <label>Output Report File Format</label>
-      <option value="table">Table</option>
-      <option value="embl">EMBL</option>
-      <option value="genbank">GENBANK</option>
-      <option value="gff">GFF</option>
-      <option value="pir">PIR</option>
-      <option value="swiss">SwissProt</option>
-      <option value="dbmotif">DbMotif</option>
-      <option value="diffseq">Diffseq</option>
-      <option value="excel">Excel (tab delimited)</option>
-      <option value="feattable">FeatTable</option>
-      <option value="motif">Motif</option>
-      <option value="regions">Regions</option>
-      <option value="seqtable">SeqTable</option>
-      <option value="simple">SRS Simple</option>
-      <option value="srs">SRS</option>
-      <option value="tagseq">TagSeq</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="table" name="out_file1" />
-  </outputs>
-  <code file="emboss_format_corrector.py" />
+<tool id="EMBOSS: twofeat104" name="twofeat" version="5.0.0.1">
+  <description>Finds neighbouring pairs of features in sequences</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>twofeat -sequence '$input1' -outfile '$out_file1' -atype '$atype' -btype '$btype' -minrange $minrange -maxrange $maxrange -asource '$asource' -asense $asense -aminscore $aminscore
+  -amaxscore $amaxscore -atag '$atag' -avalue '$avalue' -bsource '$bsource' -bsense $bsense -bminscore $bminscore -bmaxscore $bmaxscore -btag '$btag' -bvalue '$bvalue' -overlap $overlap
+  -rangetype $rangetype -sense $sense -order $order -twoout $twoout -typeout '$typeout' -rformat2 $out_format1 -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="data" label="Sequences" />
+    <param name="atype" type="text" value="*" label="Feature type you wish to allow. Feature 1" />
+    <param name="btype" type="text" value="*" label="Feature type you wish to allow. Feature 2" />
+    <param name="minrange" type="integer" value="0" label="Minimun range" />
+    <param name="maxrange" type="integer" value="0" label="Maximum range" />
+    <param name="asource" type="text" value="*" label="Feature source 1" />
+    <param name="asense" type="select" label="Feature sense 1">
+      <option value="0">Any sense</option>
+      <option value="+">Forward sense</option>
+      <option value="-">Reverse sense</option>
+    </param>
+    <param name="aminscore" type="float" value="0.0" label="Feature 1 minimum score" />
+    <param name="amaxscore" type="float" value="0.0" label="Feature1 maximum score" />
+    <param name="atag" type="text" value="*" label="Feature 1 tags" />
+    <param name="avalue" type="text" value="*" label="Feature 1 tag values" />
+    <param name="bsource" type="text" value="*" label="Feature 2 source" />
+    <param name="bsense" type="select" label="Feature 2 sense">
+      <option value="0">Any sense</option>
+      <option value="+">Forward sense</option>
+      <option value="-">Reverse sense</option>
+    </param>
+    <param name="bminscore" type="float" value="0.0" label="Feature 2 minimum score" />
+    <param name="bmaxscore" type="float" value="0.0" label="Feature 2 maximum score" />
+    <param name="btag" type="text" value="*" label="Feature 2 tags" />
+    <param name="bvalue" type="text" value="*" label="Feature 2 tag values" />
+    <param name="overlap" type="select" label="Allowed overlaps">
+      <option value="A">Any</option>
+      <option value="O">Overlap required but not within</option>
+      <option value="NO">No overlaps are allowed</option>
+      <option value="NW:">Overlap required but not within</option>
+      <option value="AW">A must be all within B</option>
+      <option value="BW">B must be all within A</option>
+    </param>
+    <param name="rangetype" type="select" label="How to determine range">
+      <option value="N">From nearest ends</option>
+      <option value="L">From left ends</option>
+      <option value="R">From right ends</option>
+      <option value="F">From furthest ends</option>
+    </param>
+    <param name="sense" type="select" label="Required sense">
+      <option value="A">Any sense</option>
+      <option value="S">Same sense</option>
+      <option value="O">Opposite sense</option>
+    </param>
+    <param name="order" type="select" label="Required order of the two features">
+      <option value="A">Any</option>
+      <option value="AB">Feature A then feature B</option>
+      <option value="BA">Feature B then feature A</option>
+    </param>
+    <param name="twoout" type="select" label="Write out the two features themselves">
+      <option value="no">No</option>
+      <option value="yes">Yes</option>
+    </param>
+    <param name="typeout" type="text" value="misc_feature" label="New feature type" />
+    <param name="out_format1" type="select" label="Output report file format">
+      <option value="table">Table</option>
+      <option value="embl">EMBL</option>
+      <option value="genbank">GENBANK</option>
+      <option value="gff">GFF</option>
+      <option value="pir">PIR</option>
+      <option value="swiss">SwissProt</option>
+      <option value="dbmotif">DbMotif</option>
+      <option value="diffseq">Diffseq</option>
+      <option value="excel">Excel (tab delimited)</option>
+      <option value="feattable">FeatTable</option>
+      <option value="motif">Motif</option>
+      <option value="regions">Regions</option>
+      <option value="seqtable">SeqTable</option>
+      <option value="simple">SRS Simple</option>
+      <option value="srs">SRS</option>
+      <option value="tagseq">TagSeq</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="table" />
+  </outputs>
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/twofeat.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/twofeat.html
   </help>
-</tool>
\ No newline at end of file
+  <expand macro="citations" />
+</tool>
--- a/emboss_union.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_union.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,46 +1,47 @@
-<tool id="EMBOSS: union105" name="union" version="5.0.0">
-  <description>Reads sequence fragments and builds one sequence</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>union -sequence $input1 -outseq $out_file1 -osformat2 $out_format1 -auto</command>
-  <inputs>
-    <param format="fasta" name="input1" type="data">
-      <label>Sequences</label>
-    </param>
-    <param name="out_format1" type="select">
-      <label>Output Sequence File Format</label>
-      <option value="fasta">FASTA (m)</option>
-      <option value="acedb">ACeDB (m)</option>
-      <option value="asn1">ASN.1 (m)</option>
-      <option value="clustal">Clustal (m)</option>
-      <option value="codata">CODATA (m)</option>
-      <option value="embl">EMBL (m)</option>
-      <option value="fitch">Fitch (m)</option>
-      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
-      <option value="genbank">GENBANK (m)</option>
-      <option value="gff">GFF (m)</option>
-      <option value="hennig86">Hennig86 (m)</option>
-      <option value="ig">Intelligenetics (m)</option>
-      <option value="jackknifer">Jackknifer (m)</option>
-      <option value="jackknifernon">Jackknifernon (m)</option>
-      <option value="mega">Mega (m)</option>
-      <option value="meganon">Meganon (m)</option>
-      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
-      <option value="pir">NBRF (PIR) (m)</option>
-      <option value="ncbi">NCBI style FASTA (m)</option>
-      <option value="nexus">Nexus/PAUP (m)</option>
-      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
-      <option value="phylip">PHYLIP interleaved (m)</option>
-      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
-      <option value="selex">SELEX (m)</option>
-      <option value="staden">Staden (s)</option>
-      <option value="strider">DNA strider (m)</option>
-      <option value="swiss">SwisProt entry (m)</option>
-      <option value="text">Plain sequence (s)</option>
-      <option value="treecon">Treecon (m)</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="fasta" name="out_file1" />
+<tool id="EMBOSS: union105" name="union" version="5.0.0">
+  <description>Reads sequence fragments and builds one sequence</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>union -sequence '$input1' -outseq '$out_file1' -osformat2 $out_format1 -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="fasta" label="Sequences" />
+    <param name="out_format1" type="select" label="Output sequence file format">
+      <option value="fasta">FASTA (m)</option>
+      <option value="acedb">ACeDB (m)</option>
+      <option value="asn1">ASN.1 (m)</option>
+      <option value="clustal">Clustal (m)</option>
+      <option value="codata">CODATA (m)</option>
+      <option value="embl">EMBL (m)</option>
+      <option value="fitch">Fitch (m)</option>
+      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
+      <option value="genbank">GENBANK (m)</option>
+      <option value="gff">GFF (m)</option>
+      <option value="hennig86">Hennig86 (m)</option>
+      <option value="ig">Intelligenetics (m)</option>
+      <option value="jackknifer">Jackknifer (m)</option>
+      <option value="jackknifernon">Jackknifernon (m)</option>
+      <option value="mega">Mega (m)</option>
+      <option value="meganon">Meganon (m)</option>
+      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
+      <option value="pir">NBRF (PIR) (m)</option>
+      <option value="ncbi">NCBI style FASTA (m)</option>
+      <option value="nexus">Nexus/PAUP (m)</option>
+      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
+      <option value="phylip">PHYLIP interleaved (m)</option>
+      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
+      <option value="selex">SELEX (m)</option>
+      <option value="staden">Staden (s)</option>
+      <option value="strider">DNA strider (m)</option>
+      <option value="swiss">SwisProt entry (m)</option>
+      <option value="text">Plain sequence (s)</option>
+      <option value="treecon">Treecon (m)</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="fasta" />
   </outputs>
   <tests>
     <test>
@@ -48,10 +49,8 @@
       <param name="out_format1" value="fasta"/>
       <output name="out_file1" file="emboss_union_out.fasta"/>
     </test>
-  </tests>
-  <code file="emboss_format_corrector.py" />
+  </tests>
   <help>
-
 .. class:: warningmark 
 
 The input dataset needs to be sequences. 
@@ -59,15 +58,8 @@
 ----- 
 
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/union.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/union.html
   </help>
+  <expand macro="citations" />
 </tool>
--- a/emboss_vectorstrip.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_vectorstrip.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,65 +1,57 @@
-<tool id="EMBOSS: vectorstrip106" name="vectorstrip" version="5.0.0">
-  <description>Strips out DNA between a pair of vector sequences</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>vectorstrip -sequence $input1 -vectorsfile $input2 -outseq $ofile1 -outfile $ofile2 -vectorfile yes -mismatch "$mismatch" -besthits $besthits -linkera "$linkera" -linkerb
-  "$linkerb" -osformat4 $out_format1 -auto</command>
-  <inputs>
-    <param format="fasta" name="input1" type="data">
-      <label>Sequences</label>
-    </param>
-    <param format="data" name="input2" type="data">
-      <label>Vector file</label>
-    </param>
-    <param name="mismatch" type="text" value="10">
-      <label>Max allowed percent mismatch</label>
-    </param>
-    <param name="besthits" type="select">
-      <label>Show only the best hits (minimize mismatches)</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="linkera" type="text" value="">
-      <label>The 5' sequence</label>
-    </param>
-    <param name="linkerb" type="text" value="">
-      <label>The 3' sequence</label>
-    </param>
-    <param name="out_format1" type="select">
-      <label>Output Sequence File Format</label>
-      <option value="fasta">FASTA (m)</option>
-      <option value="acedb">ACeDB (m)</option>
-      <option value="asn1">ASN.1 (m)</option>
-      <option value="clustal">Clustal (m)</option>
-      <option value="codata">CODATA (m)</option>
-      <option value="embl">EMBL (m)</option>
-      <option value="fitch">Fitch (m)</option>
-      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
-      <option value="genbank">GENBANK (m)</option>
-      <option value="gff">GFF (m)</option>
-      <option value="hennig86">Hennig86 (m)</option>
-      <option value="ig">Intelligenetics (m)</option>
-      <option value="jackknifer">Jackknifer (m)</option>
-      <option value="jackknifernon">Jackknifernon (m)</option>
-      <option value="mega">Mega (m)</option>
-      <option value="meganon">Meganon (m)</option>
-      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
-      <option value="pir">NBRF (PIR) (m)</option>
-      <option value="ncbi">NCBI style FASTA (m)</option>
-      <option value="nexus">Nexus/PAUP (m)</option>
-      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
-      <option value="phylip">PHYLIP interleaved (m)</option>
-      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
-      <option value="selex">SELEX (m)</option>
-      <option value="staden">Staden (s)</option>
-      <option value="strider">DNA strider (m)</option>
-      <option value="swiss">SwisProt entry (m)</option>
-      <option value="text">Plain sequence (s)</option>
-      <option value="treecon">Treecon (m)</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="fasta" name="ofile1" />
-    <data format="vectorstrip" name="ofile2" />
+<tool id="EMBOSS: vectorstrip106" name="vectorstrip" version="5.0.0.1">
+  <description>Strips out DNA between a pair of vector sequences</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>vectorstrip -sequence '$input1' -vectorsfile '$input2' -outseq '$ofile1' -outfile '$ofile2' -vectorfile yes -mismatch $mismatch -besthits $besthits -linkera '$linkera' -linkerb
+  '$linkerb' -osformat4 $out_format1 -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="fasta" label="Sequences" />
+    <param name="input2" type="data" format="data" label="Vector file" />
+    <param name="mismatch" type="integer" value="10" label="Max allowed percent mismatch" />
+    <param name="besthits" type="select" label="Show only the best hits (minimize mismatches)">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="linkera" type="text" value="" label="The 5' sequence" />
+    <param name="linkerb" type="text" value="" label="The 3' sequence" />
+    <param name="out_format1" type="select" label="Output sequence file format">
+      <option value="fasta">FASTA (m)</option>
+      <option value="acedb">ACeDB (m)</option>
+      <option value="asn1">ASN.1 (m)</option>
+      <option value="clustal">Clustal (m)</option>
+      <option value="codata">CODATA (m)</option>
+      <option value="embl">EMBL (m)</option>
+      <option value="fitch">Fitch (m)</option>
+      <option value="gcg">Wisconsin Package GCG 9.x and 10.x (s)</option>
+      <option value="genbank">GENBANK (m)</option>
+      <option value="gff">GFF (m)</option>
+      <option value="hennig86">Hennig86 (m)</option>
+      <option value="ig">Intelligenetics (m)</option>
+      <option value="jackknifer">Jackknifer (m)</option>
+      <option value="jackknifernon">Jackknifernon (m)</option>
+      <option value="mega">Mega (m)</option>
+      <option value="meganon">Meganon (m)</option>
+      <option value="msf">Wisconsin Package GCG's MSF (m)</option>
+      <option value="pir">NBRF (PIR) (m)</option>
+      <option value="ncbi">NCBI style FASTA (m)</option>
+      <option value="nexus">Nexus/PAUP (m)</option>
+      <option value="nexusnon">Nexusnon/PAUPnon (m)</option>
+      <option value="phylip">PHYLIP interleaved (m)</option>
+      <option value="phylipnon">PHYLIP non-interleaved (m)</option>
+      <option value="selex">SELEX (m)</option>
+      <option value="staden">Staden (s)</option>
+      <option value="strider">DNA strider (m)</option>
+      <option value="swiss">SwisProt entry (m)</option>
+      <option value="text">Plain sequence (s)</option>
+      <option value="treecon">Treecon (m)</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="ofile1" format="fasta" />
+    <data name="ofile2" format="vectorstrip" />
   </outputs>
   <!--  <tests>
     <test>
@@ -72,19 +64,11 @@
       <param name="out_format1" value="fasta"/>
       <output name="ofile1" file="emboss_vectorstrip_out.fasta"/>
     </test>
-  </tests> -->
-  <code file="emboss_format_corrector.py" />
+  </tests> -->
   <help>
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/vectorstrip.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/vectorstrip.html
   </help>
+  <expand macro="citations" />
 </tool>
--- a/emboss_water.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_water.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,43 +1,37 @@
-<tool id="EMBOSS: water107" name="water" version="5.0.0">
-  <description>Smith-Waterman local alignment</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>water -asequence $input1 -bsequence $input2 -outfile $out_file1 -gapopen "$gapopen" -gapextend "$gapextend" -brief $brief -aformat3 $out_format1 -auto</command>
-  <inputs>
-    <param format="fasta" name="input1" type="data">
-      <label>Sequence 1</label>
-    </param>
-    <param format="fasta" name="input2" type="data">
-      <label>Sequence 2</label>
-    </param>
-    <param name="gapopen" type="text" value="10.0">
-      <label>Gap open penalty</label>
-    </param>
-    <param name="gapextend" type="text" value="0.5">
-      <label>Gap extension penalty</label>
-    </param>
-    <param name="brief" type="select">
-      <label>Brief identity and similarity</label>
-      <option value="yes">Yes</option>
-      <option value="no">No</option>
-    </param>
-    <param name="out_format1" type="select">
-      <label>Output Alignment File Format</label>
-      <option value="srs">SRS (m)</option>
-      <option value="simple">Simple (m)</option>
-      <option value="fasta">FASTA (m)</option>
-      <option value="msf">MSF (m)</option>
-      <option value="pair">Pair (p)</option>
-      <option value="markx0">Markx0 (p)</option>
-      <option value="markx1">Markx1 (p)</option>
-      <option value="markx2">Markx2 (p)</option>
-      <option value="markx3">Markx3 (p)</option>
-      <option value="markx10">Markx10 (p)</option>
-      <option value="srspair">SRS pair (p)</option>
-      <option value="score">Score (p)</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="srs" name="out_file1" />
+<tool id="EMBOSS: water107" name="water" version="5.0.0.1">
+  <description>Smith-Waterman local alignment</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>water -asequence '$input1' -bsequence '$input2' -outfile '$out_file1' -gapopen $gapopen -gapextend $gapextend -brief $brief -aformat3 $out_format1 -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="fasta" label="Sequence 1" />
+    <param name="input2" type="data" format="fasta" label="Sequence 2" />
+    <param name="gapopen" type="float" value="10.0" label="Gap open penalty" />
+    <param name="gapextend" type="float" value="0.5" label="Gap extension penalty" />
+    <param name="brief" type="select" label="Brief identity and similarity">
+      <option value="yes">Yes</option>
+      <option value="no">No</option>
+    </param>
+    <param name="out_format1" type="select" label="Output alignment file format">
+      <option value="srs">SRS (m)</option>
+      <option value="simple">Simple (m)</option>
+      <option value="fasta">FASTA (m)</option>
+      <option value="msf">MSF (m)</option>
+      <option value="pair">Pair (p)</option>
+      <option value="markx0">Markx0 (p)</option>
+      <option value="markx1">Markx1 (p)</option>
+      <option value="markx2">Markx2 (p)</option>
+      <option value="markx3">Markx3 (p)</option>
+      <option value="markx10">Markx10 (p)</option>
+      <option value="srspair">SRS pair (p)</option>
+      <option value="score">Score (p)</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="srs" />
   </outputs>
   <tests>
     <test>
@@ -49,26 +43,17 @@
       <param name="out_format1" value="score"/>
       <output name="out_file1" file="emboss_water_out.score"/>
     </test>
-  </tests>
-  <code file="emboss_format_corrector.py" />
+  </tests>
   <help>
+.. class:: warningmark
 
-.. class:: warningmark 
+The input datasets need to be sequences.
 
-The input datasets need to be sequences. 
-
------ 
+-----
 
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/water.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/water.html
   </help>
+  <expand macro="citations" />
 </tool>
--- a/emboss_wobble.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_wobble.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,21 +1,18 @@
-<tool id="EMBOSS: wobble108" name="wobble" version="5.0.0">
-  <description>Wobble base plot</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command interpreter="perl">emboss_single_outputfile_wrapper.pl wobble -sequence $input1 -graph png -goutfile $ofile1 -outfile $ofile2 -window "$window" -bases "$bases" -auto</command>
-  <inputs>
-    <param format="fasta" name="input1" type="data">
-      <label>Sequence</label>
-    </param>
-    <param name="window" type="text" value="30">
-      <label>Window size, in codons</label>
-    </param>
-    <param name="bases" type="text" value="GC">
-      <label>Bases used</label>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="png" name="ofile1" />
-    <data format="wobble" name="ofile2" />
+<tool id="EMBOSS: wobble108" name="wobble" version="5.0.0.1">
+  <description>Wobble base plot</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <command>perl '$__tool_directory__/emboss_single_outputfile_wrapper.pl' wobble -sequence '$input1' -graph png -goutfile '$ofile1' -outfile '$ofile2' -window $window -bases '$bases' -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="fasta" label="Sequence" />
+    <param name="window" type="integer" value="30" label="Window size, in codons" />
+    <param name="bases" type="text" value="GC" label="Bases used" />
+  </inputs>
+  <outputs>
+    <data name="ofile1" format="png" />
+    <data name="ofile2" format="wobble" />
   </outputs>
   <tests>
     <test>
@@ -24,25 +21,17 @@
       <param name="bases" value="GC"/>
       <output name="ofile2" file="emboss_wobble_out.wobble"/>
     </test>
-  </tests>
+  </tests>
   <help>
+.. class:: warningmark
 
-.. class:: warningmark 
+The input dataset needs to be sequences.
 
-The input dataset needs to be sequences. 
-
------ 
+-----
 
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/wobble.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/wobble.html
   </help>
+  <expand macro="citations" />
 </tool>
--- a/emboss_wordcount.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_wordcount.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,17 +1,16 @@
-<tool id="EMBOSS: wordcount109" name="wordcount" version="5.0.0">
-  <description>Counts words of a specified size in a DNA sequence</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>wordcount -sequence $input1 -outfile $out_file1 -wordsize "$wordsize" -auto</command>
-  <inputs>
-    <param format="fasta" name="input1" type="data">
-      <label>Sequence</label>
-    </param>
-    <param name="wordsize" type="text" value="4">
-      <label>Word size</label>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="wordcount" name="out_file1" />
+<tool id="EMBOSS: wordcount109" name="wordcount" version="5.0.0.1">
+  <description>Counts words of a specified size in a DNA sequence</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <command>wordcount -sequence '$input1' -outfile '$out_file1' -wordsize $wordsize -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="fasta" label="Sequence" />
+    <param name="wordsize" type="integer" value="4" label="Word size" />
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="wordcount" />
   </outputs>
   <tests>
     <test>
@@ -19,25 +18,17 @@
       <param name="wordsize" value="4"/>
       <output name="out_file1" file="emboss_wordcount_out.wordcount"/>
     </test>
-  </tests>
+  </tests>
   <help>
+.. class:: warningmark
 
-.. class:: warningmark 
+The input dataset needs to be sequences.
 
-The input dataset needs to be sequences. 
-
------ 
+-----
 
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/wordcount.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/wordcount.html
   </help>
+  <expand macro="citations" />
 </tool>
--- a/emboss_wordmatch.xml	Fri Aug 12 19:17:10 2016 -0400
+++ b/emboss_wordmatch.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -1,51 +1,46 @@
-<tool id="EMBOSS: wordmatch110" name="wordmatch" version="5.0.0">
-  <description>Finds all exact matches of a given size between 2 sequences</description>
-  <requirements><requirement type="package" version="5.0.0">emboss</requirement></requirements>
-  <command>wordmatch -asequence $input1 -bsequence $input2 -outfile $out_file1 -aoutfeat $out_file2 -boutfeat $out_file3 -wordsize "$wordsize" -aformat3 $out_format1 -offormat4 $out_format2
-  -offormat5 $out_format3 -auto</command>
-  <inputs>
-    <param format="fasta" name="input1" type="data">
-      <label>Sequence 1</label>
-    </param>
-    <param format="fasta" name="input2" type="data">
-      <label>Sequence 2</label>
-    </param>
-    <param name="wordsize" type="text" value="4">
-      <label>Word size</label>
-    </param>
-    <param name="out_format1" type="select">
-      <label>Output Alignment File Format</label>
-      <option value="match">Match (m)</option>
-      <option value="simple">Simple (m)</option>
-      <option value="fasta">FASTA (m)</option>
-      <option value="msf">MSF (m)</option>
-      <option value="srs">SRS (m)</option>
-      <option value="pair">Pair (p)</option>
-      <option value="markx0">Markx0 (p)</option>
-      <option value="markx1">Markx1 (p)</option>
-      <option value="markx2">Markx2 (p)</option>
-      <option value="markx3">Markx3 (p)</option>
-      <option value="markx10">Markx10 (p)</option>
-      <option value="srspair">SRS pair (p)</option>
-      <option value="score">Score (p)</option>
-    </param>
-    <param name="out_format2" type="select">
-      <label>Output Feature 1 File Format</label>
-      <option value="gff">GFF</option>
-      <option value="embl">EMBL</option>
-      <option value="swiss">SwissProt</option>
-    </param>
-    <param name="out_format3" type="select">
-      <label>Output Feature 2 File Format</label>
-      <option value="gff">GFF</option>
-      <option value="embl">EMBL</option>
-      <option value="swiss">SwissProt</option>
-    </param>
-  </inputs>
-  <outputs>
-    <data format="match" name="out_file1" />
-    <data format="gff" name="out_file2" />
-    <data format="gff" name="out_file3" />
+<tool id="EMBOSS: wordmatch110" name="wordmatch" version="5.0.0.1">
+  <description>Finds all exact matches of a given size between 2 sequences</description>
+  <macros>
+    <import>macros.xml</import>
+  </macros>
+  <expand macro="requirements" />
+  <code file="emboss_format_corrector.py" />
+  <command>wordmatch -asequence '$input1' -bsequence '$input2' -outfile '$out_file1' -aoutfeat '$out_file2' -boutfeat '$out_file3' -wordsize $wordsize -aformat3 $out_format1 -offormat4 $out_format2
+  -offormat5 $out_format3 -auto</command>
+  <inputs>
+    <param name="input1" type="data" format="fasta" label="Sequence 1" />
+    <param name="input2" type="data" format="fasta" label="Sequence 2" />
+    <param name="wordsize" type="integer" value="4" label="Word size" />
+    <param name="out_format1" type="select" label="Output alignment file format">
+      <option value="match">Match (m)</option>
+      <option value="simple">Simple (m)</option>
+      <option value="fasta">FASTA (m)</option>
+      <option value="msf">MSF (m)</option>
+      <option value="srs">SRS (m)</option>
+      <option value="pair">Pair (p)</option>
+      <option value="markx0">Markx0 (p)</option>
+      <option value="markx1">Markx1 (p)</option>
+      <option value="markx2">Markx2 (p)</option>
+      <option value="markx3">Markx3 (p)</option>
+      <option value="markx10">Markx10 (p)</option>
+      <option value="srspair">SRS pair (p)</option>
+      <option value="score">Score (p)</option>
+    </param>
+    <param name="out_format2" type="select" label="Output feature 1 file format">
+      <option value="gff">GFF</option>
+      <option value="embl">EMBL</option>
+      <option value="swiss">SwissProt</option>
+    </param>
+    <param name="out_format3" type="select" label="Output feature 2 file format">
+      <option value="gff">GFF</option>
+      <option value="embl">EMBL</option>
+      <option value="swiss">SwissProt</option>
+    </param>
+  </inputs>
+  <outputs>
+    <data name="out_file1" format="match" />
+    <data name="out_file2" format="gff" />
+    <data name="out_file3" format="gff" />
   </outputs>
   <!--   <tests>
     <test>
@@ -56,27 +51,18 @@
       <param name="out_format2" value="gff"/>
       <param name="out_format3" value="gff"/>
       <output name="ofile2" file="emboss_wordmatch_out.embl"/>
-    </test> 
-  </tests> test takes a long time to run-->
-  <code file="emboss_format_corrector.py" />
+    </test>
+  </tests> test takes a long time to run-->
   <help>
+.. class:: warningmark
 
-.. class:: warningmark 
+The input datasets need to be sequences.
 
-The input datasets need to be sequences. 
-
------ 
+-----
 
     You can view the original documentation here_.
-    
-    .. _here: http://emboss.sourceforge.net/apps/release/5.0/emboss/apps/wordmatch.html
-
-------
-
-**Citation**
 
-For the underlying tool, please cite `Rice P, Longden I, Bleasby A. EMBOSS: the European Molecular Biology Open Software Suite. Trends Genet. 2000 Jun;16(6):276-7. &lt;http://www.ncbi.nlm.nih.gov/pubmed/10827456&gt;`_
-
-If you use this tool in Galaxy, please cite `Blankenberg D, Taylor J, Schenck I, He J, Zhang Y, Ghent M, Veeraraghavan N, Albert I, Miller W, Makova KD, Hardison RC, Nekrutenko A. A framework for collaborative analysis of ENCODE data: making large-scale analyses biologist-friendly. Genome Res. 2007 Jun;17(6):960-4. &lt;http://www.ncbi.nlm.nih.gov/pubmed/17568012&gt;`_
+    .. _here: http://galaxy-iuc.github.io/emboss-5.0-docs/wordmatch.html
   </help>
-</tool>
+  <expand macro="citations" />
+</tool>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/macros.xml	Mon Jan 30 13:27:40 2017 -0500
@@ -0,0 +1,14 @@
+<macros>
+    <xml name="requirements">
+        <requirements>
+            <requirement type="package" version="5.0.0">emboss</requirement>
+        </requirements>
+    </xml>
+    <xml name="citations">
+        <citations>
+            <citation type="doi">10.1016/S0168-9525(00)02024-2</citation>
+            <citation type="doi">10.1101/gr.5578007</citation>
+            <yield />
+        </citations>
+    </xml>
+</macros>