--- a/mlst_list.xml	Mon Feb 12 05:18:03 2018 -0500
+++ b/mlst_list.xml	Mon Oct 15 07:41:28 2018 -0400
@@ -1,9 +1,10 @@
-<tool id="mlst_list" name="MLST List" version="2.10">
-    <requirements>
-        <requirement type="package" version="2.10">mlst</requirement>
-    </requirements>
-
-    <version_command>mlst --version</version_command>
+<tool id="mlst_list" name="MLST List" version="@VERSION@">
+    <description>Lists available schemes for the MLST tool.</description>
+    <macros>
+        <import>macros.xml</import>
+    </macros>
+    <expand macro="requirements" />
+    <expand macro="version_command" />
 
     <command detect_errors="exit_code"><![CDATA[
         mlst $list_type > "$report"
@@ -47,13 +48,5 @@
 
     ]]></help>
 
-    <citations>
-      <citation type="bibtex">
-        @UNPUBLISHED{Seemann2016,
-        author = "Seemann T",
-        title = "ABRicate: mass screening of contigs for antiobiotic resistance genes",
-        year = "2016",
-        note = "https://github.com/tseemann/abricate"}
-      </citation>
-    </citations>
+    <expand macro="citations" />
 </tool>