diff --git a/ButterflyAspect/ButterflyAspect.html b/ButterflyAspect/ButterflyAspect.html
index 09cbc87505..841b417d8b 100644
--- a/ButterflyAspect/ButterflyAspect.html
+++ b/ButterflyAspect/ButterflyAspect.html
@@ -75,56 +75,56 @@
     <div class="float attribut-stats">
       <div class="float formular">
         <button type="roll" class="small-button norollmod" name="roll_NaRoll" value="@{abilityroll} &{template:butterfly} {{name=Nahkampf}} {{rolling=[[floor(@{Na}d10 / 2)]]}}">Nahkampf</button>
-        <button type="roll" class="small-button rollmod" name="roll_NaRoll" value="@{abilityroll} &{template:butterfly} {{name=Nahkampf}} {{rolling=[[floor((?{Würfel?|@{Na}})d10) / 2)]]}}">
+        <button type="roll" class="small-button rollmod" name="roll_NaRoll" value="@{abilityroll} &{template:butterfly} {{name=Nahkampf}} {{rolling=[[floor((?{Würfel|@{Na}}d10) / 2)]]}}">
           Nahkampf
         </button>
         <input type="number" name="attr_Na" value="1" min="1" class="number-20" />
       </div>
       <div class="float formular">
         <button type="roll" class="small-button norollmod" name="roll_FeRoll" value="@{abilityroll} &{template:butterfly} {{name=Fernkampf}} {{rolling=[[floor(@{Fe}d10 / 2)]]}}">Fernkampf</button>
-        <button type="roll" class="small-button rollmod" name="roll_FeRoll" value="@{abilityroll} &{template:butterfly} {{name=Fernkampf}} {{rolling=[[floor((?{Würfel?|@{Fe}})d10) / 2)]]}}">
+        <button type="roll" class="small-button rollmod" name="roll_FeRoll" value="@{abilityroll} &{template:butterfly} {{name=Fernkampf}} {{rolling=[[floor((?{Würfel|@{Fe}}d10) / 2)]]}}">
           Fernkampf
         </button>
         <input type="number" name="attr_Fe" value="1" min="1" class="number-20" />
       </div>
       <div class="float formular">
         <button type="roll" class="small-button norollmod" name="roll_GeRoll" value="@{abilityroll} &{template:butterfly} {{name=Geschick}} {{rolling=[[floor(@{Ge}d10 / 2)]]}}">Geschick</button>
-        <button type="roll" class="small-button rollmod" name="roll_GeRoll" value="@{abilityroll} &{template:butterfly} {{name=Geschick}} {{rolling=[[floor((?{Würfel?|@{Ge}})d10) / 2)]]}}">
+        <button type="roll" class="small-button rollmod" name="roll_GeRoll" value="@{abilityroll} &{template:butterfly} {{name=Geschick}} {{rolling=[[floor((?{Würfel|@{Ge}}d10) / 2)]]}}">
           Geschick
         </button>
         <input type="number" name="attr_Ge" value="1" min="1" class="number-20" />
       </div>
       <div class="float formular">
         <button type="roll" class="small-button norollmod" name="roll_WaRoll" value="@{abilityroll} &{template:butterfly} {{name=Wahrnehmung}} {{rolling=[[floor(@{Wa}d10 / 2)]]}}">Wahrnehmung</button>
-        <button type="roll" class="small-button rollmod" name="roll_WaRoll" value="@{abilityroll} &{template:butterfly} {{name=Wahrnehmung}} {{rolling=[[floor((?{Würfel?|@{Wa}})d10) / 2)]]}}">
+        <button type="roll" class="small-button rollmod" name="roll_WaRoll" value="@{abilityroll} &{template:butterfly} {{name=Wahrnehmung}} {{rolling=[[floor((?{Würfel|@{Wa}}d10) / 2)]]}}">
           Wahrnehmung
         </button>
         <input type="number" name="attr_Wa" value="1" min="1" class="number-20" />
       </div>
       <div class="float formular">
         <button type="roll" class="small-button norollmod" name="roll_KoRoll" value="@{abilityroll} &{template:butterfly} {{name=Konstitution}} {{rolling=[[floor(@{Ko}d10 / 2)]]}}">Konstitution</button>
-        <button type="roll" class="small-button rollmod" name="roll_KoRoll" value="@{abilityroll} &{template:butterfly} {{name=Konstitution}} {{rolling=[[floor((?{Würfel?|@{Ko}})d10) / 2)]]}}">
+        <button type="roll" class="small-button rollmod" name="roll_KoRoll" value="@{abilityroll} &{template:butterfly} {{name=Konstitution}} {{rolling=[[floor((?{Würfel|@{Ko}}d10) / 2)]]}}">
           Konstitution
         </button>
         <input type="number" name="attr_Ko" value="1" min="1" class="number-20" />
       </div>
       <div class="float formular">
         <button type="roll" class="small-button norollmod" name="roll_InRoll" value="@{abilityroll} &{template:butterfly} {{name=Intelligenz}} {{rolling=[[floor(@{In}d10 / 2)]]}}">Intelligenz</button>
-        <button type="roll" class="small-button rollmod" name="roll_InRoll" value="@{abilityroll} &{template:butterfly} {{name=Intelligenz}} {{rolling=[[floor((?{Würfel?|@{In}})d10) / 2)]]}}">
+        <button type="roll" class="small-button rollmod" name="roll_InRoll" value="@{abilityroll} &{template:butterfly} {{name=Intelligenz}} {{rolling=[[floor((?{Würfel|@{In}}d10) / 2)]]}}">
           Intelligenz
         </button>
         <input type="number" name="attr_In" value="1" min="1" class="number-20" />
       </div>
       <div class="float formular">
         <button type="roll" class="small-button norollmod" name="roll_WiRoll" value="@{abilityroll} &{template:butterfly} {{name=Wissen}} {{rolling=[[floor(@{Wi}d10 / 2)]]}}">Wissen</button>
-        <button type="roll" class="small-button rollmod" name="roll_WiRoll" value="@{abilityroll} &{template:butterfly} {{name=Wissen}} {{rolling=[[floor((?{Würfel?|@{Wi}})d10) / 2)]]}}">
+        <button type="roll" class="small-button rollmod" name="roll_WiRoll" value="@{abilityroll} &{template:butterfly} {{name=Wissen}} {{rolling=[[floor((?{Würfel|@{Wi}}d10) / 2)]]}}">
           Wissen
         </button>
         <input type="number" name="attr_Wi" value="1" min="1" class="number-20" />
       </div>
       <div class="float formular">
         <button type="roll" class="small-button norollmod" name="roll_CaRoll" value="@{abilityroll} &{template:butterfly} {{name=Charisma}} {{rolling=[[floor(@{Ca}d10 / 2)]]}}">Charisma</button>
-        <button type="roll" class="small-button rollmod" name="roll_CaRoll" value="@{abilityroll} &{template:butterfly} {{name=Charisma}} {{rolling=[[floor((?{Würfel?|@{Ca}})d10) / 2)]]}}">
+        <button type="roll" class="small-button rollmod" name="roll_CaRoll" value="@{abilityroll} &{template:butterfly} {{name=Charisma}} {{rolling=[[floor((?{Würfel|@{Ca}}d10) / 2)]]}}">
           Charisma
         </button>
         <input type="number" name="attr_Ca" value="1" min="1" class="number-20" />
@@ -176,7 +176,7 @@
               type="roll"
               class="rollmod"
               name="roll_skill"
-              value="@{abilityroll} &{template:butterfly} {{name=@{skillname}}} [[?{Modifier?|@{skill_mod}} ?{Würfel|@{skill}}]] {{rolling=[[{?{Würfel}d10! + ?{Modifier?}d10}k@{attribut}]]}}"
+              value="@{abilityroll} &{template:butterfly} {{name=@{skillname}}} [[?{Modifier|@{skill_mod}} ?{Würfel|@{skill}}]] {{rolling=[[{?{Würfel}d10! + ?{Modifier}d10}k@{attribut}]]}}"
             ></button>
           </div>
         </div>
@@ -226,7 +226,7 @@
               type="roll"
               class="rollmod"
               name="roll_weapon"
-              value="@{abilityroll} &{template:butterfly} {{name=@{weaponname}}} [[?{Modifier?|@{weaponskill_mod}} ?{Würfel|@{weaponskill}}]] {{rolling=[[{?{Würfel}d10! + ?{Modifier?}d10}k@{attribut}]]}} {{damage=[[1d10 + @{weapondamage}]]}} {{desc=@{weaponeffekt}}}"
+              value="@{abilityroll} &{template:butterfly} {{name=@{weaponname}}} [[?{Modifier|@{weaponskill_mod}} ?{Würfel|@{weaponskill}} ?{Schaden|@{weapondamage}}]] {{rolling=[[{?{Würfel}d10! + ?{Modifier}d10}k@{attribut}]]}} {{damage=[[1d10 + ?{Schaden}]]}} {{desc=@{weaponeffekt}}}"
             ></button>
           </div>
           <input class="liketextarea hiddenBox" type="text" name="attr_weaponeffekt" placeholder="Spezialeffekt" />