--- 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>