diff --git a/tools/camera/findAdducts.xml b/tools/camera/findAdducts.xml
index b58bd36e3..fb31ce367 100755
--- a/tools/camera/findAdducts.xml
+++ b/tools/camera/findAdducts.xml
@@ -1,15 +1,15 @@
-<tool id="CAMERA_findAdducts" name="CAMERA.findAdducts" version="0.1.0+camera@TOOL_VERSION@-galaxy@VERSION_SUFFIX@">
+<tool id="CAMERA_findAdducts" name="CAMERA.findAdducts" version="0.1.0+camera@TOOL_VERSION@-galaxy@VERSION_SUFFIX@" profile="23.0">
 
-	<description>Annotate adducts (and fragments) for a xsAnnotate object. Returns a xsAnnotate object with annotated pseudospectra.</description>
+    <description>Annotate adducts (and fragments) for a xsAnnotate object. Returns a xsAnnotate object with annotated pseudospectra.</description>
 
-	<macros>
-		<import>macros.xml</import>
-	</macros>
+    <macros>
+        <import>macros.xml</import>
+    </macros>
 
-	<expand macro="requirements"/>
-	<expand macro="stdio"/>
+    <expand macro="requirements"/>
+    <expand macro="stdio"/>
 
-	<command detect_errors="exit_code"><![CDATA[
+    <command detect_errors="exit_code"><![CDATA[
 		@COMMAND_RSCRIPT@/CAMERA_findAdducts.R
 		'$image'
 		$findAdducts.ppm
@@ -24,91 +24,91 @@
 		$findAdducts.numDigitsMZ
 		$findAdducts.numDigitsRT
 		]]>
-	</command>
-	<inputs>
-		<param name="image" type="data" label="RData file" format="rdata" help="Output file from another function CAMERA (findIsotopes)" />
-
-		<section name="findAdducts" title="Annotate Adducts" expanded="True">
-			<param name="ppm" type="integer" value="5" label="General ppm error" />
-			<param name="mzabs" type="float" value="0.015" label="General absolute error in m/z" />
-			<param name="polarity" type="select" label="Which polarity mode was used for measuring of the MS sample">
-				<option value="positive">positive</option>
-				<option value="negative" selected="true">negative</option>
-			</param>
-
-			<conditional name="rules_block">
-				<param name="rules_select" type="select" label="Use a personal ruleset file">
-					<option value="TRUE">TRUE</option>
-					<option value="FALSE" selected="true">FALSE</option>
-				</param>
-				<when value="FALSE">
-					<param name="rules" type="text" value="NULL" label="No personal ruleset file (using default ruleset)" optional="true" />
-				</when>
-				<when value="TRUE">
-					<param name="rules" type="data" format="csv" label="User defined ruleset" />
-				</when>
-			</conditional>
-
-			<param name="intval" type="select" label="Choose intensity values">
-				<option value="into" selected="true">into</option>
-				<option value="maxo">maxo</option>
-				<option value="intb">intb</option>
-			</param>
-
-			<conditional name="advanced">
-				<param name="advanced_select" type="select" label="Advanced parameters">
-					<option value="TRUE">TRUE</option>
-					<option value="FALSE" selected="true">FALSE</option>
-				</param>
-				<when value="FALSE">
-					<param name="multiplier" type="integer" value="3" label="Highest number(n) of allowed clusterion [nM+ion]" optional="true" />
-					<param name="max_peaks" type="integer" value="100" label="How many peaks will be calculated in every thread (parallel mode)" optional="true" />
-					<param name="psg_list" type="text" value="NULL" label="No psg_list" optional="true" />
-				</when>
-				<when value="TRUE">
-					<param name="multiplier" type="integer" value="3" label="Highest number(n) of allowed clusterion [nM+ion]" />
-					<param name="max_peaks" type="integer" value="100" label="How many peaks will be calculated in every thread (parallel mode)" />
-
-					<conditional name="psg_list_block">
-						<param name="psg_list_select" type="select" label="Use a personal psg_list">
-							<option value="TRUE">TRUE</option>
-							<option value="FALSE" selected="true">FALSE</option>
-						</param>
-						<when value="FALSE">
-							<param name="psg_list" type="text" value="NULL" label="No psg_list" optional="true" />
-						</when>
-						<when value="TRUE">
-							<param name="psg_list" type="text" optional="true" label="Pseudospectra indices (optional)" help="Provide a comma-separated list of pseudospectra indices (e.g. 1,2,3)." />
-						</when>
-					</conditional>
-				</when>
-			</conditional>
-			<param name="convertRTMinute" type="boolean" checked="true" truevalue="TRUE" falsevalue="FALSE" label="Convert seconds to minutes when exporting tsv" />
-                        <param name="numDigitsMZ" type="integer" value="4" max="4" min="0" label="Number of digits for MZ values (namecustom)" />
-                        <param name="numDigitsRT" type="integer" value="4" max="4" min="0" label="Number of digits for RT values (namecustom)" />
-		</section>
-	</inputs>
-	<outputs>
-		<data name="variableMetadata" format="tabular" label="${image.name[:-6]}.findAdducts.variableMetadata.tsv" from_work_dir="variableMetadata.tsv" />
-		<data name="camera_findAdducts_rdata" format="rdata" label="${image.name[:-6]}.findAdducts.RData" from_work_dir="camera_findAdducts.RData" />
-	</outputs>
-        <tests>
-                <test>
-                        <param name="image" value="xset.merged.groupChromPeaks.fillChromPeaks.fwhm.groupCorr.findIsotopes.RData" />
-                        <param name="ppm" value="5" />
-                        <param name="mzabs" value="0.015" />
-                        <param name="polarity" value="positive" />
-			<param name="rules" value="NULL" />
-			<param name="intval" value="into" />
-			<param name="multiplier" value="3" />
-			<param name="max_peaks" value="100" />
-			<param name="psg_list" value="NULL" />
-
-                        <output name="variableMetadata" file="xset.merged.groupChromPeaks.fillChromPeaks.fwhm.groupCorr.findIsotopes.findAdducts.variableMetadata.tsv" />
-                        <output name="camera_findAdducts_rdata" file="xset.merged.groupChromPeaks.fillChromPeaks.fwhm.groupCorr.findIsotopes.findAdducts.RData" />
-                </test>
-        </tests>	
-<help><![CDATA[
+    </command>
+    <inputs>
+        <param name="image" type="data" label="RData file" format="rdata" help="Output file from another function CAMERA (findIsotopes)" />
+
+        <section name="findAdducts" title="Annotate Adducts" expanded="True">
+            <param name="ppm" type="integer" value="5" label="General ppm error" />
+            <param name="mzabs" type="float" value="0.015" label="General absolute error in m/z" />
+            <param name="polarity" type="select" label="Which polarity mode was used for measuring of the MS sample">
+                <option value="positive">positive</option>
+                <option value="negative" selected="true">negative</option>
+            </param>
+
+            <conditional name="rules_block">
+                <param name="rules_select" type="select" label="Use a personal ruleset file">
+                    <option value="TRUE">TRUE</option>
+                    <option value="FALSE" selected="true">FALSE</option>
+                </param>
+                <when value="FALSE">
+                    <param name="rules" type="text" value="NULL" label="No personal ruleset file (using default ruleset)" optional="true" />
+                </when>
+                <when value="TRUE">
+                    <param name="rules" type="data" format="csv" label="User defined ruleset" />
+                </when>
+            </conditional>
+
+            <param name="intval" type="select" label="Choose intensity values">
+                <option value="into" selected="true">into</option>
+                <option value="maxo">maxo</option>
+                <option value="intb">intb</option>
+            </param>
+
+            <conditional name="advanced">
+                <param name="advanced_select" type="select" label="Advanced parameters">
+                    <option value="TRUE">TRUE</option>
+                    <option value="FALSE" selected="true">FALSE</option>
+                </param>
+                <when value="FALSE">
+                    <param name="multiplier" type="integer" value="3" label="Highest number(n) of allowed clusterion [nM+ion]" optional="true" />
+                    <param name="max_peaks" type="integer" value="100" label="How many peaks will be calculated in every thread (parallel mode)" optional="true" />
+                    <param name="psg_list" type="text" value="NULL" label="No psg_list" optional="true" />
+                </when>
+                <when value="TRUE">
+                    <param name="multiplier" type="integer" value="3" label="Highest number(n) of allowed clusterion [nM+ion]" />
+                    <param name="max_peaks" type="integer" value="100" label="How many peaks will be calculated in every thread (parallel mode)" />
+
+                    <conditional name="psg_list_block">
+                        <param name="psg_list_select" type="select" label="Use a personal psg_list">
+                            <option value="TRUE">TRUE</option>
+                            <option value="FALSE" selected="true">FALSE</option>
+                        </param>
+                        <when value="FALSE">
+                            <param name="psg_list" type="text" value="NULL" label="No psg_list" optional="true" />
+                        </when>
+                        <when value="TRUE">
+                            <param name="psg_list" type="text" optional="true" label="Pseudospectra indices (optional)" help="Provide a comma-separated list of pseudospectra indices (e.g. 1,2,3)." />
+                        </when>
+                    </conditional>
+                </when>
+            </conditional>
+            <param name="convertRTMinute" type="boolean" checked="true" truevalue="TRUE" falsevalue="FALSE" label="Convert seconds to minutes when exporting tsv" />
+            <param name="numDigitsMZ" type="integer" value="4" max="4" min="0" label="Number of digits for MZ values (namecustom)" />
+            <param name="numDigitsRT" type="integer" value="4" max="4" min="0" label="Number of digits for RT values (namecustom)" />
+        </section>
+    </inputs>
+    <outputs>
+        <data name="variableMetadata" format="tabular" label="${image.name[:-6]}.findAdducts.variableMetadata.tsv" from_work_dir="variableMetadata.tsv" />
+        <data name="camera_findAdducts_rdata" format="rdata" label="${image.name[:-6]}.findAdducts.RData" from_work_dir="camera_findAdducts.RData" />
+    </outputs>
+    <tests>
+        <test>
+            <param name="image" value="xset.merged.groupChromPeaks.fillChromPeaks.fwhm.groupCorr.findIsotopes.RData" />
+            <param name="ppm" value="5" />
+            <param name="mzabs" value="0.015" />
+            <param name="polarity" value="positive" />
+            <param name="rules" value="NULL" />
+            <param name="intval" value="into" />
+            <param name="multiplier" value="3" />
+            <param name="max_peaks" value="100" />
+            <param name="psg_list" value="NULL" />
+
+            <output name="variableMetadata" file="xset.merged.groupChromPeaks.fillChromPeaks.fwhm.groupCorr.findIsotopes.findAdducts.variableMetadata.tsv" />
+            <output name="camera_findAdducts_rdata" file="xset.merged.groupChromPeaks.fillChromPeaks.fwhm.groupCorr.findIsotopes.findAdducts.RData" />
+        </test>
+    </tests>
+    <help><![CDATA[
 
 @HELP_AUTHORS@
 
@@ -180,8 +180,8 @@ Changelog/News
 
 @HELP_CAMERA_SUITE@
 
-]]></help>
+]]>    </help>
 
-	<expand macro="citation"/>                                                          
-	<expand macro="creator"/>
+    <expand macro="citation"/>
+    <expand macro="creator"/>
 </tool>
diff --git a/tools/camera/findIsotopes.xml b/tools/camera/findIsotopes.xml
index b5097772f..acb6b6fc6 100755
--- a/tools/camera/findIsotopes.xml
+++ b/tools/camera/findIsotopes.xml
@@ -1,15 +1,15 @@
-<tool id="CAMERA_findIsotopes" name="CAMERA.findIsotopes" version="0.1.0+camera@TOOL_VERSION@-galaxy@VERSION_SUFFIX@">
+<tool id="CAMERA_findIsotopes" name="CAMERA.findIsotopes" version="0.1.0+camera@TOOL_VERSION@-galaxy@VERSION_SUFFIX@" profile="23.0">
 
-	<description>Annotate isotope peaks for a xsAnnotate object. Returns a xsAnnotate object with annotated isotopes.</description>
+    <description>Annotate isotope peaks for a xsAnnotate object. Returns a xsAnnotate object with annotated isotopes.</description>
 
-	<macros>
-		<import>macros.xml</import>
-	</macros>
+    <macros>
+        <import>macros.xml</import>
+    </macros>
 
-	<expand macro="requirements"/>
-	<expand macro="stdio"/>
+    <expand macro="requirements"/>
+    <expand macro="stdio"/>
 
-	<command detect_errors="exit_code"><![CDATA[
+    <command detect_errors="exit_code"><![CDATA[
 		@COMMAND_RSCRIPT@/CAMERA_findIsotopes.R
 		'$image'
 		$findIsotopes.maxcharge
@@ -21,48 +21,49 @@
 		$findIsotopes.filter
 		$findIsotopes.convertRTMinute
 		$findIsotopes.numDigitsMZ
-		$findIsotopes.numDigitsRT
-		]]></command>
-
-	<inputs>
-		<param name="image" type="data" label="RData file" format="rdata" help="output file from another function CAMERA (groupFWHM)" />
-		<section name="findIsotopes" title="Annotate Isotopes"  expanded="True">
-			<param name="maxcharge" type="integer" value="3" label="Max. ion charge" />
-			<param name="maxiso" type="integer" value="4" max="8" min="1" label="Max. number of expected isotopes" />
-			<param name="ppm" type="integer" value="5" label="ppm error for the search" />
-			<param name="mzabs" type="float" value="0.01" max="0.1" min="-0.1" label="allowed variance for the search" />
-			<param name="intval" type="select" label="choose intensity values for C12/C13 check. Allowed values are into, maxo, intb">
-				<option value="into" selected="true">into</option>
-				<option value="maxo">maxo</option>
-				<option value="intb">intb</option>
-			</param>
-			<param name="minfrac" type="float" value="0.5" max="1" min="0" label="The percentage number of samples, which must satisfy the C12/C13 rule for isotope annotation" />
-			<param name="filter" type="boolean" checked="false" truevalue="TRUE" falsevalue="FALSE" label="Should C12/C13 filter be applied" />
-			<param name="convertRTMinute" type="boolean" checked="true" truevalue="TRUE" falsevalue="FALSE" label="Convert seconds to minutes when exporting tsv" />
-                        <param name="numDigitsMZ" type="integer" value="4" max="4" min="0" label="Number of digits for MZ values (namecustom)" />
-                        <param name="numDigitsRT" type="integer" value="4" max="4" min="0" label="Number of digits for RT values (namecustom)" />
-		</section>
-	</inputs>
-	<outputs>
-		<data name="variableMetadata" format="tabular" label="${image.name[:-6]}.findIsotopes.variableMetadata.tsv" from_work_dir="variableMetadata.tsv" />
-		<data name="camera_findIsotopes_rdata" format="rdata" label="${image.name[:-6]}.findIsotopes.RData" from_work_dir="camera_findIsotopes.RData" />
-	</outputs>
-        <tests>
-                <test>
-                        <param name="image" value="xset.merged.groupChromPeaks.fillChromPeaks.fwhm.groupCorr.RData" />
-                        <param name="maxcharge" value="3" />
-                        <param name="maxiso" value="4" />
-                        <param name="ppm" value="5" />
-			<param name="mzabs" value="0.01" />
-			<param name="intval" value="into" />
-			<param name="minfrac" value="0.5" />
-			<param name="filter" value="FALSE" />
-
-                        <output name="variableMetadata" file="xset.merged.groupChromPeaks.fillChromPeaks.fwhm.groupCorr.findIsotopes.variableMetadata.tsv" />
-                        <output name="camera_findIsotopes_rdata" file="xset.merged.groupChromPeaks.fillChromPeaks.fwhm.groupCorr.findIsotopes.RData" />
-                </test>
-        </tests>	
-<help><![CDATA[
+		$findIsotopes.numDigitsRTF
+		]]>
+    </command>
+
+    <inputs>
+        <param name="image" type="data" label="RData file" format="rdata" help="output file from another function CAMERA (groupFWHM)" />
+        <section name="findIsotopes" title="Annotate Isotopes" expanded="True">
+            <param name="maxcharge" type="integer" value="3" label="Max. ion charge" />
+            <param name="maxiso" type="integer" value="4" max="8" min="1" label="Max. number of expected isotopes" />
+            <param name="ppm" type="integer" value="5" label="ppm error for the search" />
+            <param name="mzabs" type="float" value="0.01" max="0.1" min="-0.1" label="allowed variance for the search" />
+            <param name="intval" type="select" label="choose intensity values for C12/C13 check. Allowed values are into, maxo, intb">
+                <option value="into" selected="true">into</option>
+                <option value="maxo">maxo</option>
+                <option value="intb">intb</option>
+            </param>
+            <param name="minfrac" type="float" value="0.5" max="1" min="0" label="The percentage number of samples, which must satisfy the C12/C13 rule for isotope annotation" />
+            <param name="filter" type="boolean" checked="false" truevalue="TRUE" falsevalue="FALSE" label="Should C12/C13 filter be applied" />
+            <param name="convertRTMinute" type="boolean" checked="true" truevalue="TRUE" falsevalue="FALSE" label="Convert seconds to minutes when exporting tsv" />
+            <param name="numDigitsMZ" type="integer" value="4" max="4" min="0" label="Number of digits for MZ values (namecustom)" />
+            <param name="numDigitsRT" type="integer" value="4" max="4" min="0" label="Number of digits for RT values (namecustom)" />
+        </section>
+    </inputs>
+    <outputs>
+        <data name="variableMetadata" format="tabular" label="${image.name[:-6]}.findIsotopes.variableMetadata.tsv" from_work_dir="variableMetadata.tsv" />
+        <data name="camera_findIsotopes_rdata" format="rdata" label="${image.name[:-6]}.findIsotopes.RData" from_work_dir="camera_findIsotopes.RData" />
+    </outputs>
+    <tests>
+        <test>
+            <param name="image" value="xset.merged.groupChromPeaks.fillChromPeaks.fwhm.groupCorr.RData" />
+            <param name="maxcharge" value="3" />
+            <param name="maxiso" value="4" />
+            <param name="ppm" value="5" />
+            <param name="mzabs" value="0.01" />
+            <param name="intval" value="into" />
+            <param name="minfrac" value="0.5" />
+            <param name="filter" value="FALSE" />
+
+            <output name="variableMetadata" file="xset.merged.groupChromPeaks.fillChromPeaks.fwhm.groupCorr.findIsotopes.variableMetadata.tsv" />
+            <output name="camera_findIsotopes_rdata" file="xset.merged.groupChromPeaks.fillChromPeaks.fwhm.groupCorr.findIsotopes.RData" />
+        </test>
+    </tests>
+    <help><![CDATA[
 
 @HELP_AUTHORS@
 
@@ -133,8 +134,8 @@ Changelog/News
 
 @HELP_CAMERA_SUITE@
 
-]]></help>
+]]>    </help>
 
-	<expand macro="citation"/>
-	<expand macro="creator"/> 
+    <expand macro="citation"/>
+    <expand macro="creator"/>
 </tool>
diff --git a/tools/camera/groupCorr.xml b/tools/camera/groupCorr.xml
index 64e71e08f..2b5b3f2ed 100755
--- a/tools/camera/groupCorr.xml
+++ b/tools/camera/groupCorr.xml
@@ -1,15 +1,15 @@
-<tool id="CAMERA_groupCorr" name="CAMERA.groupCorr" version="0.1.0+camera@TOOL_VERSION@-galaxy@VERSION_SUFFIX@">
+<tool id="CAMERA_groupCorr" name="CAMERA.groupCorr" version="0.1.0+camera@TOOL_VERSION@-galaxy@VERSION_SUFFIX@" profile="23.0">
 
-	<description>EIC correlation grouping of LC/ESI-MS data</description>
+    <description>EIC correlation grouping of LC/ESI-MS data</description>
 
-	<macros>
-		<import>macros.xml</import>
-	</macros>
+    <macros>
+        <import>macros.xml</import>
+    </macros>
 
-	<expand macro="requirements"/>
-	<expand macro="stdio"/>
+    <expand macro="requirements"/>
+    <expand macro="stdio"/>
 
-	<command detect_errors="exit_code"><![CDATA[
+    <command detect_errors="exit_code"><![CDATA[
 		@COMMAND_RSCRIPT@/CAMERA_groupCorr.R
 		'$image'
 		$groupcorr.cor_eic_th
@@ -24,55 +24,55 @@
 		$groupcorr.numDigitsRT
 		$groupcorr.convertRTMinute
 		]]>
-	</command>
-
-	<inputs>
-		<param name="image" type="data" label="RData file" format="rdata" help="output file from another function xcms (fillPeaks)" />
-		<section name="groupcorr" title="Verifying grouping co-eluted peaks"  expanded="True">
-			<param name="cor_eic_th" type="float" value="0.75" max="1" min="0" label="Correlation threshold (0..1)" />
-			<param name="pval" type="float" value="0.05" max="1" min="0" label="Significant correlation threshold" />
-			<param name="graphMethod" type="select" label="Method selection for grouping peaks after correlation analysis into pseudospectra" >
-				<option value="hcs" selected="true">hcs</option>
-				<option value="lpc">lpc</option>
-			</param>
-			<param name="calcIso" type="boolean" checked="false" truevalue="TRUE" falsevalue="FALSE" label="Use isotopic relationship for peak grouping" />
-			<param name="calcCiS" type="boolean" checked="true" truevalue="TRUE" falsevalue="FALSE" label="Use correlation inside samples for peak grouping" />
-			<param name="calcCaS" type="boolean" checked="false" truevalue="TRUE" falsevalue="FALSE" label="Use correlation across samples for peak grouping" />
-			<param name="cor_exp_th" type="float" value="0.75" max="1" min="0" label="Threshold for intensity correlations across samples (0..1)" />
-			<param name="intval" type="select" label="Method selection for grouping peaks after correlation analysis into pseudospectra" >
-				<option value="into" selected="true">into</option>
-				<option value="maxo">maxo</option>
-				<option value="intb">intb</option>
-				<!-- <option value="intf">intf</option>
+    </command>
+
+    <inputs>
+        <param name="image" type="data" label="RData file" format="rdata" help="output file from another function xcms (fillPeaks)" />
+        <section name="groupcorr" title="Verifying grouping co-eluted peaks" expanded="True">
+            <param name="cor_eic_th" type="float" value="0.75" max="1" min="0" label="Correlation threshold (0..1)" />
+            <param name="pval" type="float" value="0.05" max="1" min="0" label="Significant correlation threshold" />
+            <param name="graphMethod" type="select" label="Method selection for grouping peaks after correlation analysis into pseudospectra">
+                <option value="hcs" selected="true">hcs</option>
+                <option value="lpc">lpc</option>
+            </param>
+            <param name="calcIso" type="boolean" checked="false" truevalue="TRUE" falsevalue="FALSE" label="Use isotopic relationship for peak grouping" />
+            <param name="calcCiS" type="boolean" checked="true" truevalue="TRUE" falsevalue="FALSE" label="Use correlation inside samples for peak grouping" />
+            <param name="calcCaS" type="boolean" checked="false" truevalue="TRUE" falsevalue="FALSE" label="Use correlation across samples for peak grouping" />
+            <param name="cor_exp_th" type="float" value="0.75" max="1" min="0" label="Threshold for intensity correlations across samples (0..1)" />
+            <param name="intval" type="select" label="Method selection for grouping peaks after correlation analysis into pseudospectra">
+                <option value="into" selected="true">into</option>
+                <option value="maxo">maxo</option>
+                <option value="intb">intb</option>
+                <!-- <option value="intf">intf</option>
 					<option value="maxf">maxf</option>
 				<option value="area">area</option> -->
-			</param>
-			<param name="numDigitsMZ" type="integer" value="4" max="4" min="0" label="Number of digits for MZ values (namecustom)" />
-                        <param name="numDigitsRT" type="integer" value="4" max="4" min="0" label="Number of digits for RT values (namecustom)" />
-			<param name="convertRTMinute" type="boolean" checked="true" truevalue="TRUE" falsevalue="FALSE" label="Convert seconds to minutes when exporting tsv" />
-		</section>
-	</inputs>
-	<outputs>
-		<data name="variableMetadata" format="tabular" label="${image.name[:-6]}.groupCorr.variableMetadata.tsv" from_work_dir="variableMetadata.tsv" />
-		<data name="camera_groupCorr_rdata" format="rdata" label="${image.name[:-6]}.groupCorr.RData" from_work_dir="camera_groupCorr.RData" />
-	</outputs>
-        <tests>
-                <test>
-                        <param name="image" value="xset.merged.groupChromPeaks.fillChromPeaks.fwhm.RData" />
-                        <param name="cor_eic_th" value="0.75" />
-                        <param name="pval" value="0.05" />
-                        <param name="graphMethod" value="hcs" />
-			<param name="calcIso" value="FALSE" />
-			<param name="calcCiS" value="TRUE" />
-			<param name="calcCaS" value="FALSE" />
-			<param name="cor_exp_th" value="0.75" />
-			<param name="intval" value="into" />
-
-                        <output name="variableMetadata" file="xset.merged.groupChromPeaks.fillChromPeaks.fwhm.groupCorr.variableMetadata.tsv" />
-                        <output name="camera_groupCorr_rdata" file="xset.merged.groupChromPeaks.fillChromPeaks.fwhm.groupCorr.RData" />
-                </test>
-        </tests>	
-<help><![CDATA[
+            </param>
+            <param name="numDigitsMZ" type="integer" value="4" max="4" min="0" label="Number of digits for MZ values (namecustom)" />
+            <param name="numDigitsRT" type="integer" value="4" max="4" min="0" label="Number of digits for RT values (namecustom)" />
+            <param name="convertRTMinute" type="boolean" checked="true" truevalue="TRUE" falsevalue="FALSE" label="Convert seconds to minutes when exporting tsv" />
+        </section>
+    </inputs>
+    <outputs>
+        <data name="variableMetadata" format="tabular" label="${image.name[:-6]}.groupCorr.variableMetadata.tsv" from_work_dir="variableMetadata.tsv" />
+        <data name="camera_groupCorr_rdata" format="rdata" label="${image.name[:-6]}.groupCorr.RData" from_work_dir="camera_groupCorr.RData" />
+    </outputs>
+    <tests>
+        <test>
+            <param name="image" value="xset.merged.groupChromPeaks.fillChromPeaks.fwhm.RData" />
+            <param name="cor_eic_th" value="0.75" />
+            <param name="pval" value="0.05" />
+            <param name="graphMethod" value="hcs" />
+            <param name="calcIso" value="FALSE" />
+            <param name="calcCiS" value="TRUE" />
+            <param name="calcCaS" value="FALSE" />
+            <param name="cor_exp_th" value="0.75" />
+            <param name="intval" value="into" />
+
+            <output name="variableMetadata" file="xset.merged.groupChromPeaks.fillChromPeaks.fwhm.groupCorr.variableMetadata.tsv" />
+            <output name="camera_groupCorr_rdata" file="xset.merged.groupChromPeaks.fillChromPeaks.fwhm.groupCorr.RData" />
+        </test>
+    </tests>
+    <help><![CDATA[
 
 @HELP_AUTHORS@
 
@@ -147,8 +147,8 @@ Changelog/News
 
 @HELP_CAMERA_SUITE@
 
-]]></help>
+]]>    </help>
 
-	<expand macro="citation"/>
-	<expand macro="creator"/>
+    <expand macro="citation"/>
+    <expand macro="creator"/>
 </tool>
diff --git a/tools/camera/groupFWHM.xml b/tools/camera/groupFWHM.xml
index f4ce55a05..1e2767a21 100755
--- a/tools/camera/groupFWHM.xml
+++ b/tools/camera/groupFWHM.xml
@@ -1,14 +1,14 @@
-<tool id="CAMERA_groupFWHM" name="CAMERA.groupFWHM" version="1.0.0+camera@TOOL_VERSION@-galaxy@VERSION_SUFFIX@">
-	<description>Group peaks of a xsAnnotate object according to their retention time into pseudospectra-groups.</description>
+<tool id="CAMERA_groupFWHM" name="CAMERA.groupFWHM" version="1.0.0+camera@TOOL_VERSION@-galaxy@VERSION_SUFFIX@" profile="23.0">
+    <description>Group peaks of a xsAnnotate object according to their retention time into pseudospectra-groups.</description>
 
-	<macros>
-		<import>macros.xml</import>
-	</macros> 
+    <macros>
+        <import>macros.xml</import>
+    </macros>
 
-	<expand macro="requirements"/>
-	<expand macro="stdio"/>
+    <expand macro="requirements"/>
+    <expand macro="stdio"/>
 
-	<command detect_errors="exit_code"><![CDATA[
+    <command detect_errors="exit_code"><![CDATA[
 		@COMMAND_RSCRIPT@/CAMERA_groupFWHM.R 
 		'$image' 
 		$groupfwhm.sigma 
@@ -18,41 +18,41 @@
 		$groupfwhm.numDigitsMZ
 		$groupfwhm.numDigitsRT
 		]]>
-	</command>
-
-	<inputs>
-		<param name="image" type="data" label="RData file" format="rdata.xcms.fillpeaks,rdata" help="output file from another function xcms (fillPeaks)" />
-		<section name="groupfwhm" title="Group co-eluted peals based on RT" expanded="True">
-			<param name="sigma" type="integer" value="6" label="the multiplier of the standard deviation"/>
-			<param name="perfwhm" type="float" value="0.6" max="1" min="0" label="percentage of the width of the FWHM"/>
-			<param name="intval" type="select" label="intensity values for ordering. Allowed values are into, maxo, intb">
-				<option value="into" selected="true">into</option>
-				<option value="maxo">maxo</option>
-				<option value="intb">intb</option>
-			</param>
-			<param name="convertRTMinute" type="boolean" checked="true" truevalue="TRUE" falsevalue="FALSE" label="Convert seconds to minutes when exporting tsv" />
-			<param name="numDigitsMZ" type="integer" value="4" max="4" min="0" label="Number of digits for MZ values (namecustom)" />
-			<param name="numDigitsRT" type="integer" value="4" max="4" min="0" label="Number of digits for RT values (namecustom)" />
-		</section>
-	</inputs>
-
-	<outputs>
-		<data name="variableMetadata" format="tabular" label="${image.name[:-6]}.fwhm.variableMetadata.tsv" from_work_dir="variableMetadata.tsv" />
-		<data name="camera_fwhm" format="rdata" label="${image.name[:-6]}.fwhm.rdata" from_work_dir="camera_fwhm.RData"/>
-	</outputs>
-
-	<tests>
-		<test>
-			<param name="image" value="xset.merged.groupChromPeaks.fillChromPeaks.RData" />
-			<param name="sigma" value="6" />
-			<param name="perfwhm" value="0.6" />
-			<param name="intval" value="into" />
-
-			<output name="variableMetadata" file="xset.merged.groupChromPeaks.fillChromPeaks.fwhm.variableMetadata.tsv" />
-			<output name="camera_fwhm" file="xset.merged.groupChromPeaks.fillChromPeaks.fwhm.rdata" />
-		</test>
-	</tests>
-<help><![CDATA[
+    </command>
+
+    <inputs>
+        <param name="image" type="data" label="RData file" format="rdata.xcms.fillpeaks,rdata" help="output file from another function xcms (fillPeaks)" />
+        <section name="groupfwhm" title="Group co-eluted peals based on RT" expanded="True">
+            <param name="sigma" type="integer" value="6" label="the multiplier of the standard deviation"/>
+            <param name="perfwhm" type="float" value="0.6" max="1" min="0" label="percentage of the width of the FWHM"/>
+            <param name="intval" type="select" label="intensity values for ordering. Allowed values are into, maxo, intb">
+                <option value="into" selected="true">into</option>
+                <option value="maxo">maxo</option>
+                <option value="intb">intb</option>
+            </param>
+            <param name="convertRTMinute" type="boolean" checked="true" truevalue="TRUE" falsevalue="FALSE" label="Convert seconds to minutes when exporting tsv" />
+            <param name="numDigitsMZ" type="integer" value="4" max="4" min="0" label="Number of digits for MZ values (namecustom)" />
+            <param name="numDigitsRT" type="integer" value="4" max="4" min="0" label="Number of digits for RT values (namecustom)" />
+        </section>
+    </inputs>
+
+    <outputs>
+        <data name="variableMetadata" format="tabular" label="${image.name[:-6]}.fwhm.variableMetadata.tsv" from_work_dir="variableMetadata.tsv" />
+        <data name="camera_fwhm" format="rdata" label="${image.name[:-6]}.fwhm.rdata" from_work_dir="camera_fwhm.RData"/>
+    </outputs>
+
+    <tests>
+        <test>
+            <param name="image" value="xset.merged.groupChromPeaks.fillChromPeaks.RData" />
+            <param name="sigma" value="6" />
+            <param name="perfwhm" value="0.6" />
+            <param name="intval" value="into" />
+
+            <output name="variableMetadata" file="xset.merged.groupChromPeaks.fillChromPeaks.fwhm.variableMetadata.tsv" />
+            <output name="camera_fwhm" file="xset.merged.groupChromPeaks.fillChromPeaks.fwhm.rdata" />
+        </test>
+    </tests>
+    <help><![CDATA[
 
 @HELP_AUTHORS@
 
@@ -113,8 +113,8 @@ Changelog/News
 
 @HELP_CAMERA_SUITE@
 
-]]></help>
+]]>    </help>
 
-	<expand macro="citation"/>
-	<expand macro="creator"/>   
+    <expand macro="citation"/>
+    <expand macro="creator"/>
 </tool>
diff --git a/tools/camera/macros.xml b/tools/camera/macros.xml
index dbd583ad5..b052be022 100644
--- a/tools/camera/macros.xml
+++ b/tools/camera/macros.xml
@@ -37,9 +37,9 @@
     <xml name="input_file_load">
         <section name="file_load_section" title="Resubmit your raw dataset or your zip file">
             <conditional name="file_load_conditional">
-                <param name="file_load_select" type="select" label="Resubmit your dataset or your zip file" help="Use only if you get a message which say that your original dataset or zip file have been deleted on the server." >
-                    <option value="no" >no need</option>
-                    <option value="yes" >yes</option>
+                <param name="file_load_select" type="select" label="Resubmit your dataset or your zip file" help="Use only if you get a message which say that your original dataset or zip file have been deleted on the server.">
+                    <option value="no">no need</option>
+                    <option value="yes">yes</option>
                 </param>
                 <when value="no">
                 </when>
@@ -83,7 +83,7 @@
             <param name="numDigitsRT" type="integer" value="0" label="Number of decimal places for retention time values reported in ions' identifiers." help="Useful to avoid duplicates within identifiers" />
             <param name="intval" type="select" label="General used intensity value" help="[intval] See the help section below">
                 <option value="into" selected="true">into</option>
-                <option value="maxo" >maxo</option>
+                <option value="maxo">maxo</option>
                 <option value="intb">intb</option>
             </param>
         </section>
@@ -115,18 +115,18 @@
             <param name="max_peaks" value="100"/>
         </section>
         <section name="diffreport">
-        <conditional name="options">
-            <param name="option" value="show"/>
-            <param name="eicmax" value="200"/>
-            <param name="eicwidth" value="200"/>
-            <param name="value" value="into"/>
-            <param name="h" value="480"/>
-            <param name="w" value="640"/>
-            <param name="mzdec" value="2"/>
-            <param name="sortpval" value="False"/>
-            <param name="tabular2" value="zip"/>
-            <param name="png2" value="zip"/>
-        </conditional>
+            <conditional name="options">
+                <param name="option" value="show"/>
+                <param name="eicmax" value="200"/>
+                <param name="eicwidth" value="200"/>
+                <param name="value" value="into"/>
+                <param name="h" value="480"/>
+                <param name="w" value="640"/>
+                <param name="mzdec" value="2"/>
+                <param name="sortpval" value="False"/>
+                <param name="tabular2" value="zip"/>
+                <param name="png2" value="zip"/>
+            </conditional>
         </section>
         <expand macro="test_peaklist"/>
     </xml>
@@ -190,7 +190,7 @@
     </xml>
 
     <xml name="creator">
-         <creator>
+        <creator>
             <organization name="MELISA" url="https://www.laberca.org/plateforme-melisa/presentation"></organization>
             <organization name="Workflow4metabolomics" url="https://workflow4metabolomics.org/"></organization>