diff --git a/Das_Schwarze_Auge_Ilaris/ilaris_roll20.html b/Das_Schwarze_Auge_Ilaris/ilaris_roll20.html
index c3ba950d0a..1a1ecd17ed 100644
--- a/Das_Schwarze_Auge_Ilaris/ilaris_roll20.html
+++ b/Das_Schwarze_Auge_Ilaris/ilaris_roll20.html
@@ -791,42 +791,42 @@
 		<div class="sheet-col">
 			<label data-i18n="Fernkampfwaffen">Fernkampfwaffen</label>
 			<input type="text" name="attr_fkw1_t" title='Name der Waffe' /><br />
-			<span data-i18n="FK">FK </span> <input type="number" name='attr_fkw1_at' class='sheet-short' title='Fernkampfwert für passende Kampffertigkeit'>
-			<button type='roll' name='roll_f1atroll' class="sheet-roll-player" title='Attacke' data-i18n-title="Attacke" value='&{template:Fernkampf} {{sp=[[@{sp}]]}} {{name=@{character_name}: Angriff! }} {{Waffe=@{fkw1_t} }} {{Erfolgswert=[[{{@{1W20}d20kh1} + @{fkw1_at} + @{mod} + @{wmodkw} + @{fkmod} - @{behinderung}}]]}} {{precision=[[[[15 + @{fkw1_at} + @{mod} + @{wmodkw} + @{fkmod} - @{behinderung}]]*[[2-@{dmod2check}]]]]}} {{Modifikator= ([[@{fkmod}]])}} {{reichweite=[[@{fmod1}]]}} {{scharfschuss=[[@{fmod2}]]}} {{zielen=[[@{fmod3a}]]}} {{meisterschuss=[[@{fmod4}]]}} {{brecher=[[@{fmod5}]]}} {{schnellschuss=[[[[@{fmod6a} + @{fmod6b}]]/-4]]}} {{gezielt=[[@{fmod7}]]}}'></button>
-			<button type='roll' name='roll_f1atroll' class="sheet-roll-gm" title='Attacke! an Meister' value='/gr {{@{1W20}d20kh1} + @{fkw1_at} + @{mod} + @{wmodkw} + @{fkmod} - @{behinderung}} AT @{fkw1_t}'></button>
-			<span data-i18n="TP">TP </span> <input type="number" name='attr_fkw1_dmd' class='sheet-short' title='Anzahl Schadenswürfel'> d6+
+			<button data-i18n="FK" type='roll' name='roll_f1atroll' class="sheet-roll-player" title='Attacke' data-i18n-title="Attacke" value='&{template:Fernkampf} {{sp=[[@{sp}]]}} {{name=@{character_name}: Angriff! }} {{Waffe=@{fkw1_t} }} {{Erfolgswert=[[{{@{1W20}d20kh1} + @{fkw1_at} + @{mod} + @{wmodkw} + @{fkmod} - @{behinderung}}]]}} {{precision=[[[[15 + @{fkw1_at} + @{mod} + @{wmodkw} + @{fkmod} - @{behinderung}]]*[[2-@{dmod2check}]]]]}} {{Modifikator= ([[@{fkmod}]])}} {{reichweite=[[@{fmod1}]]}} {{scharfschuss=[[@{fmod2}]]}} {{zielen=[[@{fmod3a}]]}} {{meisterschuss=[[@{fmod4}]]}} {{brecher=[[@{fmod5}]]}} {{schnellschuss=[[[[@{fmod6a} + @{fmod6b}]]/-4]]}} {{gezielt=[[@{fmod7}]]}}'>FK</button>
+			<button data-i18n="FK" type='roll' name='roll_f1atroll' class="sheet-roll-gm" title='Attacke! an Meister' value='/gr {{@{1W20}d20kh1} + @{fkw1_at} + @{mod} + @{wmodkw} + @{fkmod} - @{behinderung}} AT @{fkw1_t}'>FK</button>
+			<input type="number" name='attr_fkw1_at' class='sheet-short' title='Fernkampfwert für passende Kampffertigkeit'>
+			<button data-i18n="TP" type='roll' name='roll_f1dmg' class="sheet-roll-player" title='Schaden' data-i18n-title="Schaden" value='&{template:Schaden} {{sp=[[@{sp}]]}} {{name=@{character_name}: Schaden }} {{Waffe=@{fkw1_t}}} {{Schaden=[[{@{fkw1_dmd}d6 + @{fkw1_dmn} + @{gdmod} + @{dmod1}d6 + @{dmod2}*@{ge} + @{komm2} + @{fmod2}}]]}} {{scharfschuss=[[@{fmod2}]]}} {{meisterschuss=[[@{fmod4}]]}} {{brecher=[[@{fmod5}]]}} {{precisiontoggle=[[@{dmod2}]]}} {{gesegnet=[[@{dmod1}]]}}'>TP</button>
+			<button data-i18n="TP" type='roll' name='roll_f1dmg' class="sheet-roll-gm" title='Schaden! an Meister' value='/gr {@{fkw1_dmd}d6 + @{fkw1_dmn} + @{gdmod} + @{dmod1}d6 + @{dmod2}*@{ge} + @{komm2} + @{fmod2}} Schaden @{fkw1_t}'>TP</button>
+			<input type="number" name='attr_fkw1_dmd' class='sheet-short' title='Anzahl Schadenswürfel'> d6+
 			<input type="number" name='attr_fkw1_dmn' value='0' class='sheet-short' title='Waffenschaden'>
-			<button type='roll' name='roll_f1dmg' class="sheet-roll-player" title='Schaden' data-i18n-title="Schaden" value='&{template:Schaden} {{sp=[[@{sp}]]}} {{name=@{character_name}: Schaden }} {{Waffe=@{fkw1_t}}} {{Schaden=[[{@{fkw1_dmd}d6 + @{fkw1_dmn} + @{gdmod} + @{dmod1}d6 + @{dmod2}*@{ge} + @{komm2} + @{fmod2}}]]}} {{scharfschuss=[[@{fmod2}]]}} {{meisterschuss=[[@{fmod4}]]}} {{brecher=[[@{fmod5}]]}} {{precisiontoggle=[[@{dmod2}]]}} {{gesegnet=[[@{dmod1}]]}}'></button>
-			<button type='roll' name='roll_f1dmg' class="sheet-roll-gm" title='Schaden! an Meister' value='/gr {@{fkw1_dmd}d6 + @{fkw1_dmn} + @{gdmod} + @{dmod1}d6 + @{dmod2}*@{ge} + @{komm2} + @{fmod2}} Schaden @{fkw1_t}'></button>
 			<br />
 			<br />
 			<input type="text" name="attr_fkw2_t" title='Name der Waffe' /><br />
-			<span data-i18n="FK">FK </span> <input type="number" name='attr_fkw2_at' class='sheet-short' title='Fernkampfwert für passende Kampffertigkeit'>
-			<button type='roll' name='roll_f2atroll' class="sheet-roll-player" title='Attacke' data-i18n-title="Attacke" value='&{template:Fernkampf} {{sp=[[@{sp}]]}} {{name=@{character_name}: Angriff! }} {{Waffe=@{fkw2_t} }} {{Erfolgswert=[[{{@{1W20}d20kh1} + @{fkw2_at} + @{mod} + @{wmodkw} + @{fkmod} - @{behinderung}}]]}} {{precision=[[[[15 + @{fkw2_at} + @{mod} + @{wmodkw} + @{fkmod} - @{behinderung}]]*[[2-@{dmod2check}]]]]}} {{Modifikator= ([[@{fkmod}]])}} {{reichweite=[[@{fmod1}]]}} {{scharfschuss=[[@{fmod2}]]}} {{zielen=[[@{fmod3a}]]}} {{meisterschuss=[[@{fmod4}]]}} {{brecher=[[@{fmod5}]]}} {{schnellschuss=[[[[@{fmod6a} + @{fmod6b}]]/-4]]}} {{gezielt=[[@{fmod7}]]}}'></button>
-			<button type='roll' name='roll_f2atroll' class="sheet-roll-gm" title='Attacke! an Meister' value='/gr {{@{1W20}d20kh1} + @{fkw2_at} + @{mod} + @{wmodkw} + @{fkmod} - @{behinderung}} AT @{fkw2_t}'></button>
-			<span data-i18n="TP">TP </span> <input type="number" name='attr_fkw2_dmd' class='sheet-short' title='Anzahl Schadenswürfel'> d6+
-			<input type="number" name='attr_fkw2_dmn' value='0' class='sheet-short' title='Waffenschaden'>
-			<button type='roll' name='roll_f2dmg' class="sheet-roll-player" title='Schaden' data-i18n-title="Schaden" value='&{template:Schaden} {{sp=[[@{sp}]]}} {{name=@{character_name}: Schaden }} {{Waffe=@{fkw2_t}}} {{Schaden=[[{@{fkw2_dmd}d6 + @{fkw2_dmn} + @{gdmod} + @{dmod1}d6 + @{dmod2}*@{ge} + @{komm2} + @{fmod2}}]]}} {{scharfschuss=[[@{fmod2}]]}} {{meisterschuss=[[@{fmod4}]]}} {{brecher=[[@{fmod5}]]}} {{precisiontoggle=[[@{dmod2}]]}} {{gesegnet=[[@{dmod1}]]}}'></button>
-			<button type='roll' name='roll_f2dmg' class="sheet-roll-gm" title='Schaden! an Meister' value='/gr {@{fkw2_dmd}d6 + @{fkw2_dmn} + @{gdmod} + @{dmod1}d6 + @{dmod2}*@{ge} + @{komm2} + @{fmod2}} Schaden @{fkw2_t}'></button>
+			<button data-i18n="FK" type='roll' name='roll_f2atroll' class="sheet-roll-player" title='Attacke' data-i18n-title="Attacke" value='&{template:Fernkampf} {{sp=[[@{sp}]]}} {{name=@{character_name}: Angriff! }} {{Waffe=@{fkw2_t} }} {{Erfolgswert=[[{{@{1W20}d20kh1} + @{fkw2_at} + @{mod} + @{wmodkw} + @{fkmod} - @{behinderung}}]]}} {{precision=[[[[15 + @{fkw2_at} + @{mod} + @{wmodkw} + @{fkmod} - @{behinderung}]]*[[2-@{dmod2check}]]]]}} {{Modifikator= ([[@{fkmod}]])}} {{reichweite=[[@{fmod1}]]}} {{scharfschuss=[[@{fmod2}]]}} {{zielen=[[@{fmod3a}]]}} {{meisterschuss=[[@{fmod4}]]}} {{brecher=[[@{fmod5}]]}} {{schnellschuss=[[[[@{fmod6a} + @{fmod6b}]]/-4]]}} {{gezielt=[[@{fmod7}]]}}'>FK</button>
+			<button data-i18n="FK" type='roll' name='roll_f2atroll' class="sheet-roll-gm" title='Attacke! an Meister' value='/gr {{@{1W20}d20kh1} + @{fkw2_at} + @{mod} + @{wmodkw} + @{fkmod} - @{behinderung}} AT @{fkw2_t}'>FK</button>
+			<input type="number" name='attr_fkw2_at' class='sheet-short' title='Fernkampfwert für passende Kampffertigkeit'>
+			<button data-i18n="TP" type='roll' name='roll_f2dmg' class="sheet-roll-player" title='Schaden' data-i18n-title="Schaden" value='&{template:Schaden} {{sp=[[@{sp}]]}} {{name=@{character_name}: Schaden }} {{Waffe=@{fkw2_t}}} {{Schaden=[[{@{fkw2_dmd}d6 + @{fkw2_dmn} + @{gdmod} + @{dmod1}d6 + @{dmod2}*@{ge} + @{komm2} + @{fmod2}}]]}} {{scharfschuss=[[@{fmod2}]]}} {{meisterschuss=[[@{fmod4}]]}} {{brecher=[[@{fmod5}]]}} {{precisiontoggle=[[@{dmod2}]]}} {{gesegnet=[[@{dmod1}]]}}'>TP</button>
+			<button data-i18n="TP" type='roll' name='roll_f2dmg' class="sheet-roll-gm" title='Schaden! an Meister' value='/gr {@{fkw2_dmd}d6 + @{fkw2_dmn} + @{gdmod} + @{dmod1}d6 + @{dmod2}*@{ge} + @{komm2} + @{fmod2}} Schaden @{fkw2_t}'>TP</button>
+			<input type="number" name='attr_fkw2_dmd' class='sheet-short' title='Anzahl Schadenswürfel'> d6+
+			<input type="number" name='attr_fkw2_dmn' value='0' class='sheet-short' title='Waffenschaden'>			
 			<br />
 			<br />
 			<input type="text" name="attr_fkw3_t" title='Name der Waffe' /><br />
-			<span data-i18n="FK">FK </span> <input type="number" name='attr_fkw3_at' class='sheet-short' title='Fernkampfwert für passende Kampffertigkeit'>
-			<button type='roll' name='roll_f3atroll' class="sheet-roll-player" title='Attacke' data-i18n-title="Attacke" value='&{template:Fernkampf} {{sp=[[@{sp}]]}} {{name=@{character_name}: Angriff! }} {{Waffe=@{fkw3_t}}} {{Erfolgswert=[[{{@{1W20}d20kh1} + @{fkw3_at} + @{mod} + @{wmodkw} + @{fkmod} - @{behinderung}}]]}} {{precision=[[[[15 + @{fkw3_at} + @{mod} + @{wmodkw} + @{fkmod} - @{behinderung}]]*[[2-@{dmod2check}]]]]}} {{Modifikator= ([[@{fkmod}]])}} {{reichweite=[[@{fmod1}]]}} {{scharfschuss=[[@{fmod2}]]}} {{zielen=[[@{fmod3a}]]}} {{meisterschuss=[[@{fmod4}]]}} {{brecher=[[@{fmod5}]]}} {{schnellschuss=[[[[@{fmod6a} + @{fmod6b}]]/-4]]}} {{gezielt=[[@{fmod7}]]}}'></button>
-			<button type='roll' name='roll_f3atroll' class="sheet-roll-gm" title='Attacke! an Meister' value='/gr {{@{1W20}d20kh1} + @{fkw3_at} + @{mod} + @{wmodkw} + @{fkmod} - @{behinderung}} AT @{fkw3_t}'></button>
-			<span data-i18n="TP">TP </span> <input type="number" name='attr_fkw3_dmd' class='sheet-short' title='Anzahl Schadenswürfel'> d6+
-			<input type="number" name='attr_fkw3_dmn' value='0' class='sheet-short' title='Waffenschaden'>
-			<button type='roll' name='roll_f3dmg' class="sheet-roll-player" title='Schaden' data-i18n-title="Schaden" value='&{template:Schaden} {{sp=[[@{sp}]]}} {{name=@{character_name}: Schaden }} {{Waffe=@{fkw3_t}}} {{Schaden=[[{@{fkw3_dmd}d6 + @{fkw3_dmn} + @{gdmod} + @{dmod1}d6 + @{dmod2}*@{ge} + @{komm2} + @{fmod2}}]]}}  {{scharfschuss=[[@{fmod2}]]}} {{meisterschuss=[[@{fmod4}]]}} {{brecher=[[@{fmod5}]]}} {{precisiontoggle=[[@{dmod2}]]}} {{gesegnet=[[@{dmod1}]]}}'></button>
-			<button type='roll' name='roll_f3dmg' class="sheet-roll-gm" title='Schaden! an Meister' value='/gr {@{fkw3_dmd}d6 + @{fkw3_dmn} + @{gdmod} + @{dmod1}d6 + @{dmod2}*@{ge} + @{komm2} + @{fmod2}} Schaden @{fkw3_t}'></button>
+			<button data-i18n="FK" type='roll' name='roll_f3atroll' class="sheet-roll-player" title='Attacke' data-i18n-title="Attacke" value='&{template:Fernkampf} {{sp=[[@{sp}]]}} {{name=@{character_name}: Angriff! }} {{Waffe=@{fkw3_t}}} {{Erfolgswert=[[{{@{1W20}d20kh1} + @{fkw3_at} + @{mod} + @{wmodkw} + @{fkmod} - @{behinderung}}]]}} {{precision=[[[[15 + @{fkw3_at} + @{mod} + @{wmodkw} + @{fkmod} - @{behinderung}]]*[[2-@{dmod2check}]]]]}} {{Modifikator= ([[@{fkmod}]])}} {{reichweite=[[@{fmod1}]]}} {{scharfschuss=[[@{fmod2}]]}} {{zielen=[[@{fmod3a}]]}} {{meisterschuss=[[@{fmod4}]]}} {{brecher=[[@{fmod5}]]}} {{schnellschuss=[[[[@{fmod6a} + @{fmod6b}]]/-4]]}} {{gezielt=[[@{fmod7}]]}}'>FK</button>
+			<button data-i18n="FK" type='roll' name='roll_f3atroll' class="sheet-roll-gm" title='Attacke! an Meister' value='/gr {{@{1W20}d20kh1} + @{fkw3_at} + @{mod} + @{wmodkw} + @{fkmod} - @{behinderung}} AT @{fkw3_t}'>FK</button>
+			<input type="number" name='attr_fkw3_at' class='sheet-short' title='Fernkampfwert für passende Kampffertigkeit'>
+			<button data-i18n="TP" type='roll' name='roll_f3dmg' class="sheet-roll-player" title='Schaden' data-i18n-title="Schaden" value='&{template:Schaden} {{sp=[[@{sp}]]}} {{name=@{character_name}: Schaden }} {{Waffe=@{fkw3_t}}} {{Schaden=[[{@{fkw3_dmd}d6 + @{fkw3_dmn} + @{gdmod} + @{dmod1}d6 + @{dmod2}*@{ge} + @{komm2} + @{fmod2}}]]}}  {{scharfschuss=[[@{fmod2}]]}} {{meisterschuss=[[@{fmod4}]]}} {{brecher=[[@{fmod5}]]}} {{precisiontoggle=[[@{dmod2}]]}} {{gesegnet=[[@{dmod1}]]}}'>TP</button>
+			<button data-i18n="TP" type='roll' name='roll_f3dmg' class="sheet-roll-gm" title='Schaden! an Meister' value='/gr {@{fkw3_dmd}d6 + @{fkw3_dmn} + @{gdmod} + @{dmod1}d6 + @{dmod2}*@{ge} + @{komm2} + @{fmod2}} Schaden @{fkw3_t}'>TP</button>
+			<input type="number" name='attr_fkw3_dmd' class='sheet-short' title='Anzahl Schadenswürfel'> d6+
+			<input type="number" name='attr_fkw3_dmn' value='0' class='sheet-short' title='Waffenschaden'>			
 			<br />
 			<br />
 			<fieldset class="repeating_additionalrangedweapon">
 			<input type="text" name="attr_fkwrep_t" title='Name der Waffe' /><br />
-			<span data-i18n="FK">FK </span> <input type="number" name='attr_fkwrep_at' class='sheet-short' title='Fernkampfwert für passende Kampffertigkeit'>
-			<button type='roll' name='roll_f3atroll' class="sheet-roll-player" title='Attacke' data-i18n-title="Attacke" value='&{template:Fernkampf} {{sp=[[@{sp}]]}} {{name=@{character_name}: Angriff! }} {{Waffe=@{fkwrep_t}}} {{Erfolgswert=[[{{@{1W20}d20kh1} + @{fkwrep_at} + @{mod} + @{wmodkw} + @{fkmod} - @{behinderung}}]]}} {{precision=[[[[15 + @{fkwrep_at} + @{mod} + @{wmodkw} + @{fkmod} - @{behinderung}]]*[[2-@{dmod2check}]]]]}} {{Modifikator= ([[@{fkmod}]])}} {{reichweite=[[@{fmod1}]]}} {{scharfschuss=[[@{fmod2}]]}} {{zielen=[[@{fmod3a}]]}} {{meisterschuss=[[@{fmod4}]]}} {{brecher=[[@{fmod5}]]}} {{schnellschuss=[[[[@{fmod6a} + @{fmod6b}]]/-4]]}} {{gezielt=[[@{fmod7}]]}}'></button>
-			<span data-i18n="TP">TP </span> <input type="number" name='attr_fkwrep_dmd' class='sheet-short' title='Anzahl Schadenswürfel'> d6+
-			<input type="number" name='attr_fkwrep_dmn' value='0' class='sheet-short' title='Waffenschaden'>
-			<button type='roll' name='roll_f3dmg' class="sheet-roll-player" title='Schaden' data-i18n-title="Schaden" value='&{template:Schaden} {{sp=[[@{sp}]]}} {{name=@{character_name}: Schaden }} {{Waffe=@{fkwrep_t}}} {{Schaden=[[{@{fkwrep_dmd}d6 + @{fkwrep_dmn} + @{gdmod} + @{dmod1}d6 + @{dmod2}*@{ge} + @{komm2} + @{fmod2}}]]}}  {{scharfschuss=[[@{fmod2}]]}} {{meisterschuss=[[@{fmod4}]]}} {{brecher=[[@{fmod5}]]}} {{precisiontoggle=[[@{dmod2}]]}} {{gesegnet=[[@{dmod1}]]}}'></button>
+			<button data-i18n="FK" type='roll' name='roll_f3atroll' class="sheet-roll-player" title='Attacke' data-i18n-title="Attacke" value='&{template:Fernkampf} {{sp=[[@{sp}]]}} {{name=@{character_name}: Angriff! }} {{Waffe=@{fkwrep_t}}} {{Erfolgswert=[[{{@{1W20}d20kh1} + @{fkwrep_at} + @{mod} + @{wmodkw} + @{fkmod} - @{behinderung}}]]}} {{precision=[[[[15 + @{fkwrep_at} + @{mod} + @{wmodkw} + @{fkmod} - @{behinderung}]]*[[2-@{dmod2check}]]]]}} {{Modifikator= ([[@{fkmod}]])}} {{reichweite=[[@{fmod1}]]}} {{scharfschuss=[[@{fmod2}]]}} {{zielen=[[@{fmod3a}]]}} {{meisterschuss=[[@{fmod4}]]}} {{brecher=[[@{fmod5}]]}} {{schnellschuss=[[[[@{fmod6a} + @{fmod6b}]]/-4]]}} {{gezielt=[[@{fmod7}]]}}'>FK</button>
+			<input type="number" name='attr_fkwrep_at' class='sheet-short' title='Fernkampfwert für passende Kampffertigkeit'>
+			<button type='roll' name='roll_f3dmg' class="sheet-roll-player" title='Schaden' data-i18n-title="Schaden" value='&{template:Schaden} {{sp=[[@{sp}]]}} {{name=@{character_name}: Schaden }} {{Waffe=@{fkwrep_t}}} {{Schaden=[[{@{fkwrep_dmd}d6 + @{fkwrep_dmn} + @{gdmod} + @{dmod1}d6 + @{dmod2}*@{ge} + @{komm2} + @{fmod2}}]]}}  {{scharfschuss=[[@{fmod2}]]}} {{meisterschuss=[[@{fmod4}]]}} {{brecher=[[@{fmod5}]]}} {{precisiontoggle=[[@{dmod2}]]}} {{gesegnet=[[@{dmod1}]]}}'>TP</button>
+			<input type="number" name='attr_fkwrep_dmd' class='sheet-short' title='Anzahl Schadenswürfel'> d6+
+			<input data-i18n="TP" type="number" name='attr_fkwrep_dmn' value='0' class='sheet-short' title='Waffenschaden'>			
 			<br />
 			</fieldset>