--- a/vsnp_build_tables.xml	Fri May 08 16:58:19 2020 +0000
+++ b/vsnp_build_tables.xml	Wed Sep 30 19:05:39 2020 +0000
@@ -1,5 +1,8 @@
-<tool id="vsnp_build_tables" name="vSNP: build tables" version="1.0.0">
+<tool id="vsnp_build_tables" name="vSNP: build tables" version="@WRAPPER_VERSION@.0" profile="@PROFILE@">
     <description></description>
+    <macros>
+        <import>macros.xml</import>
+    </macros>
     <requirements>
         <requirement type="package" version="1.76">biopython</requirement>
         <requirement type="package" version="0.25.3">pandas</requirement>
@@ -52,10 +55,7 @@
 ]]></command>
     <inputs>
         <conditional name="input_type_cond">
-            <param name="input_type" type="select" label="Choose the category for the files to be analyzed">
-                <option value="single" selected="true">Single files</option>
-                <option value="collection">Collection of files</option>
-            </param>
+            <expand macro="param_input_type"/>
             <when value="single">
                 <param name="input_snps_json" type="data" format="json" label="SNPs json file">
                     <validator type="unspecified_build"/>
@@ -192,15 +192,6 @@
  * **Choose the category for the files to be analyzed** -  select "Single files" or "Collections of files", then select the appropriate history items (single SNPs json, average MQ json and newick files, or collections of each) based on the selected option.
  * **Use Genbank file** - Select "yes" to annotate the tables using the information in the Genbank file.  Locally cached files, if available, provide the most widely used annotations, but more custom Genbank files can be chosen from the current history.
     </help>
-    <citations>
-        <citation type="bibtex">
-            @misc{None,
-            journal = {None},
-            author = {1. Stuber T},
-            title = {Manuscript in preparation},
-            year = {None},
-            url = {https://github.com/USDA-VS/vSNP},}
-        </citation>
-    </citations>
+    <expand macro="citations"/>
 </tool>