--- a/macros.xml	Thu Mar 23 11:54:44 2017 -0400
+++ b/macros.xml	Thu Mar 23 15:01:27 2017 -0400
@@ -13,6 +13,71 @@
             <regex match="Exception:"/>
         </stdio>
     </xml>
+    <token name="@REMOVE_GAPPY_SEQUENCES_COND@">
+        #set remove_gappy_sequences_cond = $options_type_cond.remove_gappy_sequences_cond
+        #set remove_gappy_sequences = $remove_gappy_sequences_cond.remove_gappy_sequences
+        #if str($remove_gappy_sequences) == 'no':
+            #set multiple_sequence_alignments_cond = $remove_gappy_sequences_cond.multiple_sequence_alignments_cond
+            #set multiple_sequence_alignments = $multiple_sequence_alignments_cond.multiple_sequence_alignments
+            #if str($multiple_sequence_alignments) == 'yes':
+                #set multiple_sequence_alignments_option_cond = $multiple_sequence_alignments_cond.multiple_sequence_alignments_option_cond
+                #set multiple_sequence_alignments_option = $multiple_sequence_alignments_option_cond.multiple_sequence_alignments_option
+                #if str($multiple_sequence_alignments_option) == 'pasta_alignments':
+                    #set pasta_iter_limit = $multiple_sequence_alignments_option_cond.pasta_iter_limit
+                #end if
+            #end if
+        #else:
+            #set trim_type_cond = $remove_gappy_sequences_cond.trim_type_cond
+            #set trim_type = $trim_type_cond.trim_type
+            #if str($trim_type) == 'gap_trimming':
+                #set gap_trimming = $trim_type_cond.gap_trimming
+            #end if
+            #set remove_sequences_with_gaps_cond = $remove_gappy_sequences_cond.remove_sequences_with_gaps_cond
+            #set remove_sequences_with_gaps = $remove_sequences_with_gaps_cond.remove_sequences_with_gaps
+            #if str($remove_sequences_with_gaps) == 'no':
+                #set multiple_sequence_alignments_cond = $remove_sequences_with_gaps_cond.multiple_sequence_alignments_cond
+                #set multiple_sequence_alignments = $multiple_sequence_alignments_cond.multiple_sequence_alignments
+                #if str($multiple_sequence_alignments) == 'yes':
+                    #set multiple_sequence_alignments_option_cond = $multiple_sequence_alignments_cond.multiple_sequence_alignments_option_cond
+                    #set multiple_sequence_alignments_option = $multiple_sequence_alignments_option_cond.multiple_sequence_alignments_option
+                    #if str($multiple_sequence_alignments_option) == 'pasta_alignments':
+                        #set pasta_iter_limit = $multiple_sequence_alignments_option_cond.pasta_iter_limit
+                    #end if
+                #end if
+            #else:
+                #set remove_sequences_with_gaps_of = $remove_sequences_with_gaps_cond.remove_sequences_with_gaps_of
+                #set multiple_sequence_alignments_cond = $remove_sequences_with_gaps_cond.multiple_sequence_alignments_cond
+                #set multiple_sequence_alignments = $multiple_sequence_alignments_cond.multiple_sequence_alignments
+                #if str($multiple_sequence_alignments) == 'yes':
+                    #set multiple_sequence_alignments_option_cond = $multiple_sequence_alignments_cond.multiple_sequence_alignments_option_cond
+                    #set multiple_sequence_alignments_option = $multiple_sequence_alignments_option_cond.multiple_sequence_alignments_option
+                    #if str($multiple_sequence_alignments_option) == 'pasta_alignments':
+                        #set pasta_iter_limit = $multiple_sequence_alignments_option_cond.pasta_iter_limit
+                    #else if str($multiple_sequence_alignments_option) == 'iterative_realignments':
+                        #set iterative_realignments = $multiple_sequence_alignments_option_cond.iterative_realignments
+                    #end if
+                #end if
+            #end if
+        #end if
+    </token>
+    <token name="@SET_PHYLOGENETIC_TREES@">
+        #set phylogenetic_trees_cond = $options_type_cond.phylogenetic_trees_cond
+        #set phylogenetic_trees = $phylogenetic_trees_cond.phylogenetic_trees
+    </token>
+    <token name="@TREE_INFERENCE_COND@">
+        #set tree_inference_cond = $phylogenetic_trees_cond.tree_inference_cond
+        #set tree_inference = $tree_inference_cond.tree_inference
+        #if str($tree_inference) == 'raxml':
+            #set rooting_order_file_cond = $tree_inference_cond.rooting_order_file_cond
+            #set rooting_order_file = $rooting_order_file_cond.rooting_order_file
+            #if str($rooting_order_file) == 'yes':
+                #set rooting_order = $rooting_order_file_cond.rooting_order
+            #end if
+            #set bootstrap_replicates = $tree_inference_cond.bootstrap_replicates
+        #end if
+        #set max_orthogroup_size = $phylogenetic_trees_cond.max_orthogroup_size
+        #set min_orthogroup_size = $phylogenetic_trees_cond.min_orthogroup_size
+    </token>
     <xml name="param_scaffold">
         <param name="scaffold" type="select" label="Orthogroups or gene families proteins scaffold">
             <options from_data_table="plant_tribes_scaffolds" />
@@ -202,10 +267,10 @@
                         <option value="gap_trimming" selected="true">Nucleotide based </option>
                         <option value="automated_trimming">Trim alignments using trimAl's ML heuristic trimming approach</option>
                     </param>
-                    <when value="automated_trimming" />
                     <when value="gap_trimming">
                         <param name="gap_trimming" type="float" value="0.1" min="0" max="1.0" label="Remove sites in alignments with gaps of" help="0.1 removes sites with 90% gaps" />
                     </when>
+                    <when value="automated_trimming" />
                 </conditional>
                 <conditional name="remove_sequences_with_gaps_cond">
                     <param name="remove_sequences_with_gaps" type="select" label="Remove sequences with specified gaps?">