--- a/abricate_list.xml	Mon Sep 04 02:47:12 2017 -0400
+++ b/abricate_list.xml	Mon Mar 19 10:42:19 2018 -0400
@@ -1,9 +1,12 @@
-<tool id="abricate_list" name="ABRicate List" version="0.7">
-    <requirements>
-        <requirement type="package" version="0.7">abricate</requirement>
-    </requirements>
-
-    <version_command>abricate --version</version_command>
+<tool id="abricate_list" name="ABRicate List" version="@VERSION@">
+    <description>
+        List all of abricate's available databases.
+    </description>
+    <macros>
+        <import>macros.xml</import>
+    </macros>
+    <expand macro="requirements" />
+    <expand macro="version_command" />
 
     <command detect_errors="exit_code"><![CDATA[
         abricate --list > '$report'
@@ -28,14 +31,5 @@
 ABRicate List will list all the antibiotic databases used by ABRicate. The database of these genes is built from ResFinder.
     ]]></help>
 
-    <citations>
-        <citation type="bibtex">
-@UNPUBLISHED{Seemann2016,
-    author = {Seemann, Torsten},
-    title = {ABRicate: mass screening of contigs for antiobiotic resistance genes},
-    year = {2016},
-    url = {https://github.com/tseemann/abricate},
-}
-        </citation>
-    </citations>
+    <expand macro="citations"/>
 </tool>