Great Weapon Fighter Macro

I saw someone post one about how to get GWF to work using the re-roll once mechanic.  It didn't really work right as it would only re-roll the first number less than 2.  So here's the macro I've got /em attacks  &{template:default} {{name=Great Sword}}{{Range= Melee}}{{attack=[[1d20@{Strength}@{Proficiency}+1]] | [[1d20@{Strength}@{Proficiency}+1]] D/A}}{{Weapon=[[1d6ro<2+1d6ro<2@{Strength}+1]] | [[1d6ro<2+1d6ro<2]] Critical}} As a note my group adds strength and proficiency attributes to the character sheets, so we don't have to go back in and change stuff in each macro when our stats change.  The important part of the macro is separating out the 2d6 into [[1d6ro<2+1d6ro<2]] so that it'll re-roll both dice if they're both less than 2, but will still put the end result in a neat easy to read box.

If you are using either of the community created 5e sheets the stat bonuses and proficiency bonuses are automatically adjusted. 

As i understand you want the critical calcul to be separated for the 2 rolls of 1D6? If so, you can do that : &{template:default} {{name=Great Sword}}{{Range= Melee}}{{attack=[[1d20@{Strength}@{Proficiency}+1]] | [[1d20@{Strength}@{Proficiency}+1]] D/A}}{{Weapon=[[1d6ro<2+1d6ro<2@{Strength}+1]] | [[1d6ro<2]]+[[1d6ro<2]] Critical}}