diff --git a/Thorg/thorg.css b/Thorg/thorg.css
index a04ef6252a..374b99008d 100644
--- a/Thorg/thorg.css
+++ b/Thorg/thorg.css
@@ -353,6 +353,14 @@ table.sheet-xp td{
 	column-gap: 20px;
 }
 
+.sheet-archetyp-grid {
+	display: grid;
+	grid-template-columns: 2fr 1fr 1fr 1fr;
+	grid-template-rows: auto;
+	justify-items: start;
+	column-gap: 5px;
+}
+
 .sheet-attr-boni-grid{
 	display: grid;
 	grid-template-columns: repeat(6, 12%);
@@ -363,7 +371,7 @@ table.sheet-xp td{
 
 .sheet-attribute-grid{
 	display: grid;
-	grid-template-columns: 25px 25px auto auto auto auto auto 40px;
+	grid-template-columns: 25px 25px auto auto auto auto auto auto 40px;
 	grid-template-rows: 40px auto;
 	justify-items: start;
 	column-gap: 5px;2
@@ -372,7 +380,7 @@ table.sheet-xp td{
 .sheet-berechnung-grid{
 	display: grid;
 	grid-template-columns: 25px auto auto auto auto auto;
-	grid-template-rows: 40px auto;
+	grid-template-rows: 30px auto;
 	justify-items: start;
 	column-gap: 5px;
 }
@@ -419,7 +427,7 @@ table.sheet-xp td{
 
 .sheet-zauber-char-grid{
 	display: grid;
-	grid-template-columns: 1fr 2fr 1fr;
+	grid-template-columns: 1fr 1fr;
 	grid-template-rows: auto;
 	justify-items: start;
 	align-items: center;
@@ -428,8 +436,8 @@ table.sheet-xp td{
 
 .sheet-zauber-grid{
 	display: grid;
-	grid-template-columns: 25px 2fr 1fr 1fr 2fr 1fr;
-	grid-template-rows: 30px auto;
+	grid-template-columns: 25px 2fr 1fr 1fr 1fr 2fr 1fr;
+	grid-template-rows: 40px auto;
 	justify-items: start;
 	column-gap: 5px;
 }
@@ -456,8 +464,8 @@ table.sheet-xp td{
 
 .sheet-psi-grid{
 	display: grid;
-	grid-template-columns: 25px 2fr 50px 1fr 1fr 2fr 1fr;
-	grid-template-rows: 30px auto;
+	grid-template-columns: 25px 2fr 50px 1fr 1fr 1fr 2fr 1fr;
+	grid-template-rows: 40px auto;
 	justify-items: start;
 	column-gap: 5px;
 }
@@ -552,7 +560,7 @@ table.sheet-xp td{
 
 .repcontainer[data-groupname="repeating_zauber"] > .repitem {
     display: grid;
-	grid-template-columns: 25px auto auto auto auto auto;
+	grid-template-columns: 25px auto auto auto auto auto auto;
 	grid-template-rows: auto;
 	justify-items: start;
 	column-gap: 5px;
@@ -560,7 +568,7 @@ table.sheet-xp td{
 
 .repcontainer[data-groupname="repeating_psi"] > .repitem {
     display: grid;
-	grid-template-columns: 25px auto 50px auto auto auto auto;
+	grid-template-columns: 25px auto 50px auto auto auto auto auto;
 	grid-template-rows: auto;
 	justify-items: start;
 	column-gap: 5px;
@@ -582,6 +590,14 @@ table.sheet-xp td{
 	column-gap: 5px;
 }
 
+.repcontainer[data-groupname="repeating_archetyp"] > .repitem {
+    display: grid;
+	grid-template-columns: 2fr 1fr 1fr 1fr;
+	grid-template-rows: auto;
+	justify-items: start;
+	column-gap: 5px;
+}
+
 .sheet-rolltemplate-basic div.sheet-template-container {
 background: gray;
 color: black;
diff --git a/Thorg/thorg.html b/Thorg/thorg.html
index 45c551636e..2ca9070c8b 100644
--- a/Thorg/thorg.html
+++ b/Thorg/thorg.html
@@ -81,15 +81,29 @@
 			<span class="sheet-tab-label">Attribute</span>
 			<div class="sheet-tab-content">
 				<div class="sheet-content">
-					
 					<div class="sheet-heading">Boni</div>
 					<div class="sheet-block">
-						<div class="sheet-attr-boni-grid">
+						<div class="sheet-exp-grid">
+							<span></span>
+							<span><label class="sheet-label">Wert</label></span>
+							<span><label class="sheet-label">Modifikation</label></span>
+							<span><label class="sheet-label">Gesamt</label></span>
+							
 							<span><label class="sheet-label">GE-Bonus:</label></span>
+							<span><input type="number" style="width: 6em" name="attr_ge_bonus_basis" value="0" readonly></span>
+							<span><input type="number" style="width: 6em" name="attr_ge_bonus_mod" min="-999" max="999" value="0"></span>
 							<span><input type="number" style="width: 6em" name="attr_ge_bonus" value="0" readonly></span>
+							
+							
 							<span><label class="sheet-label">KO-Bonus:</label></span>
+							<span><input type="number" style="width: 6em" name="attr_ko_bonus_basis" value="0" readonly></span>
+							<span><input type="number" style="width: 6em" name="attr_ko_bonus_mod" min="-999" max="999" value="0"></span>
 							<span><input type="number" style="width: 6em" name="attr_ko_bonus" value="0" readonly></span>
+							
+							
 							<span><label class="sheet-label">Lernbonus:</label></span>
+							<span><input type="number" style="width: 6em" name="attr_lernbonus_basis" value="0" readonly></span>
+							<span><input type="number" style="width: 6em" name="attr_lernbonus_mod" min="-999" max="999" value="0"></span>
 							<span><input type="number" style="width: 6em" name="attr_lernbonus" value="0" readonly></span>
 						</div>
 					</div>
@@ -103,6 +117,7 @@
 							<span><label class="sheet-label">Wert</label></span>
 							<span><label class="sheet-label">Dauerhafte Modifikation</label></span>
 							<span><label class="sheet-label">Temporäre Modifikation</label></span>
+							<span><label class="sheet-label">Bonus für Proben</label></span>
 							<span><label class="sheet-label">Gesamt</label></span>
 							<span><label class="sheet-label">Steig.</label></span>
 							
@@ -112,6 +127,7 @@
 							<span><input type="number" style="width: 6em" name="attr_aus_basis" min="0" value="0"></span>
 							<span><input type="number" style="width: 6em" name="attr_aus_dmod" min="-999" max="999" value="0"></span>
 							<span><input type="number" style="width: 6em" name="attr_aus_tmod" min="-999" max="999" value="0"></span>
+							<span></span>
 							<span><input type="number" style="width: 6em" name="attr_aus" value="0" readonly></span>
 							<span><button type="roll" class="sheet-rollbutton_black" name="roll_aus_steigerung" value="@{aus_steigerung}"></button><button type="action" class="hidden" name="act_aus-steigerung"></button><input type="hidden" class="hidden" name="attr_aus_steigerung" value=""></span>
 
@@ -121,6 +137,7 @@
 							<span><input type="number" style="width: 6em" name="attr_ge_basis" min="0" value="0"></span>
 							<span><input type="number" style="width: 6em" name="attr_ge_dmod" min="-999" max="999" value="0"></span>
 							<span><input type="number" style="width: 6em" name="attr_ge_tmod" min="-999" max="999" value="0"></span>
+							<span></span>
 							<span><input type="number" style="width: 6em" name="attr_ge" value="0" readonly></span>
 							<span><button type="roll" class="sheet-rollbutton_black" name="roll_ge_steigerung" value="@{ge_steigerung}"></button><button type="action" class="hidden" name="act_ge-steigerung"></button><input type="hidden" class="hidden" name="attr_ge_steigerung" value=""></span>
 
@@ -130,6 +147,7 @@
 							<span><input type="number" style="width: 6em" name="attr_in_basis" min="0" value="0"></span>
 							<span><input type="number" style="width: 6em" name="attr_in_dmod" min="-999" max="999" value="0"></span>
 							<span><input type="number" style="width: 6em" name="attr_in_tmod" min="-999" max="999" value="0"></span>
+							<span></span>
 							<span><input type="number" style="width: 6em" name="attr_in" value="0" readonly></span>
 							<span><button type="roll" class="sheet-rollbutton_black" name="roll_in_steigerung" value="@{in_steigerung}"></button><button type="action" class="hidden" name="act_in-steigerung"></button><input type="hidden" class="hidden" name="attr_in_steigerung" value=""></span>
 
@@ -139,6 +157,7 @@
 							<span><input type="number" style="width: 6em" name="attr_kl_basis" min="0" value="0"></span>
 							<span><input type="number" style="width: 6em" name="attr_kl_dmod" min="-999" max="999" value="0"></span>
 							<span><input type="number" style="width: 6em" name="attr_kl_tmod" min="-999" max="999" value="0"></span>
+							<span></span>
 							<span><input type="number" style="width: 6em" name="attr_kl" value="0" readonly></span>
 							<span><button type="roll" class="sheet-rollbutton_black" name="roll_kl_steigerung" value="@{kl_steigerung}"></button><button type="action" class="hidden" name="act_kl-steigerung"></button><input type="hidden" class="hidden" name="attr_kl_steigerung" value=""></span>
 
@@ -148,6 +167,7 @@
 							<span><input type="number" style="width: 6em" name="attr_ko_basis" min="0" value="0"></span>
 							<span><input type="number" style="width: 6em" name="attr_ko_dmod" min="-999" max="999" value="0"></span>
 							<span><input type="number" style="width: 6em" name="attr_ko_tmod" min="-999" max="999" value="0"></span>
+							<span></span>
 							<span><input type="number" style="width: 6em" name="attr_ko" value="0" readonly></span>
 							<span><button type="roll" class="sheet-rollbutton_black" name="roll_ko_steigerung" value="@{ko_steigerung}"></button><button type="action" class="hidden" name="act_ko-steigerung"></button><input type="hidden" class="hidden" name="attr_ko_steigerung" value=""></span>
 
@@ -157,6 +177,7 @@
 							<span><input type="number" style="width: 6em" name="attr_kk_basis" min="0" value="0"></span>
 							<span><input type="number" style="width: 6em" name="attr_kk_dmod" min="-999" max="999" value="0"></span>
 							<span><input type="number" style="width: 6em" name="attr_kk_tmod" min="-999" max="999" value="0"></span>
+							<span></span>
 							<span><input type="number" style="width: 6em" name="attr_kk" value="0" readonly></span>
 							<span><button type="roll" class="sheet-rollbutton_black" name="roll_kk_steigerung" value="@{kk_steigerung}"></button><button type="action" class="hidden" name="act_kk-steigerung"></button><input type="hidden" class="hidden" name="attr_kk_steigerung" value=""></span>
 
@@ -166,6 +187,7 @@
 							<span><input type="number" style="width: 6em" name="attr_mb_basis" min="0" value="0"></span>
 							<span><input type="number" style="width: 6em" name="attr_mb_dmod" min="-999" max="999" value="0"></span>
 							<span><input type="number" style="width: 6em" name="attr_mb_tmod" min="-999" max="999" value="0"></span>
+							<span><input type="number" style="width: 6em" name="attr_mb_bonus" min="-999" max="999" value="0"></span>
 							<span><input type="number" style="width: 6em" name="attr_mb" value="0" readonly></span>
 							<span><button type="roll" class="sheet-rollbutton_black" name="roll_mb_steigerung" value="@{mb_steigerung}"></button><button type="action" class="hidden" name="act_mb-steigerung"></button><input type="hidden" class="hidden" name="attr_mb_steigerung" value=""></span>
 
@@ -175,6 +197,7 @@
 							<span><input type="number" style="width: 6em" name="attr_mu_basis" min="0" value="0"></span>
 							<span><input type="number" style="width: 6em" name="attr_mu_dmod" min="-999" max="999" value="0"></span>
 							<span><input type="number" style="width: 6em" name="attr_mu_tmod" min="-999" max="999" value="0"></span>
+							<span></span>
 							<span><input type="number" style="width: 6em" name="attr_mu" value="0" readonly></span>
 							<span><button type="roll" class="sheet-rollbutton_black" name="roll_mu_steigerung" value="@{mu_steigerung}"></button><button type="action" class="hidden" name="act_mu-steigerung"></button><input type="hidden" class="hidden" name="attr_mu_steigerung" value=""></span>
 
@@ -184,6 +207,7 @@
 							<span><input type="number" style="width: 6em" name="attr_rw_basis" min="0" value="0"></span>
 							<span><input type="number" style="width: 6em" name="attr_rw_dmod" min="-999" max="999" value="0"></span>
 							<span><input type="number" style="width: 6em" name="attr_rw_tmod" min="-999" max="999" value="0"></span>
+							<span></span>
 							<span><input type="number" style="width: 6em" name="attr_rw" value="0" readonly></span>
 							<span><button type="roll" class="sheet-rollbutton_black" name="roll_rw_steigerung" value="@{rw_steigerung}"></button><button type="action" class="hidden" name="act_rw-steigerung"></button><input type="hidden" class="hidden" name="attr_rw_steigerung" value=""></span>
 						</div>
@@ -242,8 +266,7 @@
 							<span><input type="number" style="width: 6em" name="attr_mr" max="80" value="0" readonly></span>
 							
 						</div>
-					</div>
-				
+					</div>		
 				</div>
 			</div>
 		</div>
@@ -1739,7 +1762,6 @@
 							<div class="sheet-block" >
 								<div class="sheet-zauber-char-grid">
 									<span><label class="sheet-label">Charakter ist:</label></span>
-									<span><input type="checkbox" title="ist_marjag" name="attr_zauber_marjag" value="1" unchecked> Marjag mit MB-Bonus von <input type="number" style="width: 4em" name="attr_zauber_marjag_mod" min="0" max="30" value="0"></span>
 									<span><input type="checkbox" title="ist_quinkie" name="attr_zauber_quinkie" value="1" unchecked> Quinkie</span>
 								</div>
 							</div>
@@ -1759,6 +1781,7 @@
 							<span></span>
 							<span><label class="sheet-label">Zauber</label></span>
 							<span><label class="sheet-label">Probe</label></span>
+							<span><label class="sheet-label">Essenz</label></span>
 							<span><label class="sheet-label">EP-Kosten</label></span>
 							<span><label class="sheet-label">Notiz</label></span>
 							<span><label class="sheet-label">Anzahl Anw.</label></span>
@@ -1767,6 +1790,7 @@
 							<span><button type="roll" class="sheet-rollbutton" name="roll_zauber_probe" value="@{zauber_probe}"></button><button type="action" class="hidden" name="act_zauber-probe"></button><input type="hidden" class="hidden" name="attr_zauber_probe" value=""></span>
 							<span><input type="text" class="sheet-input" name="attr_zauber_name"/></span>
 							<span><input type="number" style="width: 6em" name="attr_zauber_mod" min="-999" max="999" value="0"></span>
+							<span><input type="number" style="width: 6em" name="attr_zauber_me" min="0" max="999" value="0"></span>
 							<span><input type="number" style="width: 6em" name="attr_zauber_ep_kosten" min="0" max="999" value="0"></span>
 							<span><input type="text" class="sheet-input" name="attr_zauber_notiz"/></span>
 							<span><input type="number" style="width: 6em" name="attr_zauber_anzahl" min="0" max="9999" value="0"><input class="hidden" type="number" name="attr_zauber_ep" min="0" max="9999" value="0" readonly></span>
@@ -1788,6 +1812,7 @@
 							<span><label class="sheet-label">Psi-Kraft</label></span>
 							<span><label class="sheet-label">Attr.</label></span>
 							<span><label class="sheet-label">Probe</label></span>
+							<span><label class="sheet-label">Psi-Punkte</label></span>
 							<span><label class="sheet-label">EP-Kosten</label></span>
 							<span><label class="sheet-label">Notiz</label></span>
 							<span><label class="sheet-label">Anzahl Anw.</label></span>
@@ -1797,6 +1822,7 @@
 							<span><input type="text" class="sheet-input" list="psi_liste" name="attr_psi_name"/></span>
 							<span><select style="width: 50px" name="attr_psi_attribut"><option value="0" selected="selected">IN</option><option value="1">KL</option></select></span>
 							<span><input type="number" style="width: 6em" name="attr_psi_mod" min="-999" max="999" value="0"></span>
+							<span><input type="number" style="width: 6em" name="attr_psi_pp" min="0" max="999" value="0"></span>
 							<span><input type="number" style="width: 6em" name="attr_psi_ep_kosten" min="0" max="999" value="0"></span>
 							<span><input type="text" class="sheet-input" name="attr_psi_notiz"/></span>
 							<span><input type="number" style="width: 6em" name="attr_psi_anzahl" min="0" max="9999" value="0"><input class="hidden" type="number" name="attr_zauber_ep" min="0" max="9999" value="0" readonly></span>
@@ -2451,6 +2477,9 @@
 									<span><label class="sheet-label">An</label></span>
 									<span><label class="sheet-label">Kategorie</label></span>
 									<span><label class="sheet-label">Gewicht</label></span>
+									<span><input type="checkbox" title="ausruestung_geld" name="attr_ausruestung_geld" value="1" unchecked></span>
+									<span><input type="text" class="sheet-input" name="attr_geld_name" value="Geld" readonly/></span>
+									<span><input type="number" step="any" style="width: 5em" name="attr_geld_gesamtgewicht" value="0" readonly></span>
 									<span><input type="checkbox" title="ausruestung_kleidung" name="attr_ausruestung_kleidung" value="1" unchecked></span>
 									<span><input type="text" class="sheet-input" name="attr_kleidung_name" value="Kleidung" readonly/></span>
 									<span><input type="number" step="any" style="width: 5em" name="attr_kleidung_gesamtgewicht" value="0" readonly></span>
@@ -2680,6 +2709,92 @@
 							<span><input type="number" style="width: 8em" name="attr_abenteuer_ep" min="0" max="9999" value="0"></span>
 						</fieldset>
 					</div>
+					
+					<div class="sheet-heading">Archetypen</div>
+					<div class="sheet-block">
+						<div class="sheet-archetyp-grid">
+							<span><label class="sheet-label">Archetyp</label></span>
+							<span><label class="sheet-label">Anfangs-EP</label></span>
+							<span><label class="sheet-label">End-EP </label></span>
+							<span><label class="sheet-label">Gesamt-EP</label></span>
+						</div>
+						<fieldset class="repeating_archetyp">
+							<span><input type="text" class="sheet-input" list="archetyp_liste" style="width: 150%" name="attr_archetyp_name"/></span>
+							<span><input type="number" style="width: 8em" name="attr_archetyp_ep_anfang" min="0" value="0"></span>
+							<span><input type="number" style="width: 8em" name="attr_archetyp_ep_ende" min="0" value="100"></span>
+							<span><input type="number" style="width: 8em" name="attr_archetyp_ep_gesamt" min="0" value="100" readonly></span>
+						</fieldset>
+						<datalist id="archetyp_liste">
+							<option value="Adept des Ordens"></option>
+							<option value="Adliger"></option>
+							<option value="Agent"></option>
+							<option value="Astronom"></option>
+							<option value="Barbar"></option>
+							<option value="Bestienzähmer"></option>
+							<option value="Chaosjäger"></option>
+							<option value="Dieb"></option>
+							<option value="Erfinder"></option>
+							<option value="Ex Soldat"></option>
+							<option value="Händler"></option>
+							<option value="Heiler"></option>
+							<option value="Jäger"></option>
+							<option value="Krieger"></option>
+							<option value="Magielehrling"></option>
+							<option value="Mönch"></option>
+							<option value="Runenschmied"></option>
+							<option value="Söldner"></option>
+							<option value="Seefahrer"></option>
+							<option value="Artefaktmagier"></option>
+							<option value="Dämonologe"></option>
+							<option value="Druide"></option>
+							<option value="Elementarmagier"></option>
+							<option value="Hexer / Schamane"></option>
+							<option value="Illusionsmagie"></option>
+							<option value="Imperialer Kriegsmagier"></option>
+							<option value="Kampfmagier"></option>
+							<option value="Klassische Magierlaufbahn"></option>
+							<option value="Magietheoretiker der Alten"></option>
+							<option value="Mystiker"></option>
+							<option value="Nekromant"></option>
+							<option value="Philosoph"></option>
+							<option value="Priester"></option>
+							<option value="Wahrsagerin"></option>
+							<option value="Weg der Ausdauer"></option>
+							<option value="Weg der Einsicht"></option>
+							<option value="Weg der inneren Kraft"></option>
+							<option value="Weg der Klugheit"></option>
+							<option value="Weg der Schnelligkeit"></option>
+							<option value="Weg der Stärke"></option>
+							<option value="Weg des Reiters"></option>
+							<option value="Weg des Schützen"></option>
+							<option value="Gladiator"></option>
+							<option value="Kai Lord"></option>
+							<option value="Kaiserlicher Protector"></option>
+							<option value="Marineinfanterist"></option>
+							<option value="Ordensritter"></option>
+							<option value="Paladin"></option>
+							<option value="Ritter"></option>
+							<option value="Samurai"></option>
+							<option value="Schwertmeister"></option>
+							<option value="Walküre"></option>
+							<option value="Alchimist"></option>
+							<option value="Assassine"></option>
+							<option value="Bestienmeister"></option>
+							<option value="Diplomat"></option>
+							<option value="Barde"></option>
+							<option value="Gaukler"></option>
+							<option value="Imperialer Spion"></option>
+							<option value="Kampfmönch"></option>
+							<option value="Kaufmann"></option>
+							<option value="Kopfgeldjäger"></option>
+							<option value="Meisterdieb"></option>
+							<option value="Ninja"></option>
+							<option value="Pirat / Gesetzloser"></option>
+							<option value="Psi Meister"></option>
+							<option value="Waldläufer"></option>
+						</datalist>
+					</div>
+					
 				</div>
 			</div>
 		</div>
@@ -2742,36 +2857,43 @@
 		<div class="sheet-template-header">{{type}}-Probe</div>
 		<div class="sheet-template-row">{{type}}: <b>{{name}}</b></div>
 		<div class="sheet-template-row">Magiebegabung: {{wert}}</div>
-		{{#^rollGreater() check wert}}
-			<div class="sheet-template-row">
-			{{#rollWasCrit() check}} 
-				Kritischer 
-			{{/rollWasCrit() check}}			
-			Erfolg! {{check}}
-			</div>
-			{{#rollTotal() quinki 1}}
+		{{#rollTotal() attrcheck 0}}
+			{{#^rollGreater() check wert}}
 				<div class="sheet-template-row">
-					Quinki-Varianz:
-					{{#rollBetween() qcheck 1 50}}
-						<br><b>Wirkung verringert! </b>{{qcheck}}
-					{{/rollBetween() qcheck 1 50}}
-					{{#rollBetween() qcheck 51 99}}
-						<br><b>Wirkung verbessert! </b>{{qcheck}}
-					{{/rollBetween() qcheck 51 99}}
-					{{#rollWasFumble() qcheck}} 
-						<br><b>Mutation ausgelöst! </b>{{qcheck}}
-					{{/rollWasFumble() qcheck}}
-				</div>	
-			{{/rollTotal() quinki 1}}
-		{{/^rollGreater() check wert}}
-		{{#rollGreater() check wert}}	
-			<div class="sheet-template-row">
-				{{#rollWasFumble() check}} 
+				{{#rollWasCrit() check}} 
 					Kritischer 
-				{{/rollWasFumble() check}}
-				Misserfolg! {{check}}
-			</div>		
-		{{/rollGreater() check wert}}
+				{{/rollWasCrit() check}}			
+				Erfolg! {{check}}
+				</div>
+				{{#rollTotal() quinki 1}}
+					<div class="sheet-template-row">
+						Quinki-Varianz:
+						{{#rollBetween() qcheck 1 50}}
+							<br><b>Wirkung verringert! </b>{{qcheck}}
+						{{/rollBetween() qcheck 1 50}}
+						{{#rollBetween() qcheck 51 99}}
+							<br><b>Wirkung verbessert! </b>{{qcheck}}
+						{{/rollBetween() qcheck 51 99}}
+						{{#rollWasFumble() qcheck}} 
+							<br><b>Mutation ausgelöst! </b>{{qcheck}}
+						{{/rollWasFumble() qcheck}}
+					</div>	
+				{{/rollTotal() quinki 1}}
+			{{/^rollGreater() check wert}}
+			{{#rollGreater() check wert}}	
+				<div class="sheet-template-row">
+					{{#rollWasFumble() check}} 
+						Kritischer 
+					{{/rollWasFumble() check}}
+					Misserfolg! {{check}}
+				</div>		
+			{{/rollGreater() check wert}}
+		{{/rollTotal() attrcheck 0}}
+		{{#rollTotal() attrcheck 1}}
+			<div class="sheet-template-row">
+				<b>Aktuell nicht ausreichend Essenz oder Ausdauer für den Zauber vorhanden.</b>
+			</div>
+		{{/rollTotal() attrcheck 1}}
 	</div>
 </rolltemplate>
 
@@ -2786,23 +2908,30 @@
 	<div class="sheet-template-container">
 		<div class="sheet-template-header">{{type}}-Probe</div>
 		<div class="sheet-template-row">{{type}}: <b>{{name}}</b></div>
-		<div class="sheet-template-row">{{attribut}}: {{wert}}</div>
-		{{#^rollGreater() check wert}}
-			<div class="sheet-template-row">
-			{{#rollWasCrit() check}} 
-				Kritischer 
-			{{/rollWasCrit() check}}			
-			Erfolg! {{check}}
-			</div>
-		{{/^rollGreater() check wert}}
-		{{#rollGreater() check wert}}	
-			<div class="sheet-template-row">
-				{{#rollWasFumble() check}} 
+		{{#rollTotal() attrcheck 0}}
+			<div class="sheet-template-row">{{attribut}}: {{wert}}</div>
+			{{#^rollGreater() check wert}}
+				<div class="sheet-template-row">
+				{{#rollWasCrit() check}} 
 					Kritischer 
-				{{/rollWasFumble() check}}
-				Misserfolg! {{check}}
-			</div>		
-		{{/rollGreater() check wert}}
+				{{/rollWasCrit() check}}			
+				Erfolg! {{check}}
+				</div>
+			{{/^rollGreater() check wert}}
+			{{#rollGreater() check wert}}	
+				<div class="sheet-template-row">
+					{{#rollWasFumble() check}} 
+						Kritischer 
+					{{/rollWasFumble() check}}
+					Misserfolg! {{check}}
+				</div>		
+			{{/rollGreater() check wert}}
+		{{/rollTotal() attrcheck 0}}
+		{{#rollTotal() attrcheck 1}}
+			<div class="sheet-template-row">
+				<b>Aktuell nicht ausreichend Psi-Punkte oder Ausdauer für die Psi-Kraft vorhanden.</b>
+			</div>
+		{{/rollTotal() attrcheck 1}}
 	</div>
 </rolltemplate>
 
@@ -2829,47 +2958,54 @@
 <script type="text/worker">
 /**Beginn Attribute**/
 /**GE-Bonus**/
-on("change:ge", function() {
-	getAttrs(["ge"], function(values) {
-		var attr_ge = parseInt(values["ge"])||0;
-		if ( attr_ge >= 61 && attr_ge <= 70 ) { setAttrs({ ["ge_bonus"]: 2 }); };
-		if ( attr_ge >= 71 && attr_ge <= 80 ) { setAttrs({ ["ge_bonus"]: 3 }); };
-		if ( attr_ge >= 81 && attr_ge <= 90 ) { setAttrs({ ["ge_bonus"]: 4 }); };
-		if ( attr_ge >= 91 && attr_ge <= 100 ) { setAttrs({ ["ge_bonus"]: 5 }); };
-		if ( attr_ge >= 101 && attr_ge <= 110 ) { setAttrs({ ["ge_bonus"]: 6 }); };
-		if ( attr_ge >= 111 && attr_ge <= 120 ) { setAttrs({ ["ge_bonus"]: 7 }); };
-		if ( attr_ge >= 121 && attr_ge <= 130 ) { setAttrs({ ["ge_bonus"]: 8 }); };
-		if ( attr_ge >= 131 && attr_ge <= 140 ) { setAttrs({ ["ge_bonus"]: 9 }); };
-		if ( attr_ge >= 141 && attr_ge <= 150 ) { setAttrs({ ["ge_bonus"]: 11 }); };
-		if ( attr_ge >= 151 && attr_ge <= 160 ) { setAttrs({ ["ge_bonus"]: 12 }); };
+on("change:ge change:ge_bonus_mod", function() {
+	getAttrs(["ge", "ge_bonus_mod"], function(values) {
+		var ge = parseInt(values["ge"])||0;
+		var gebm = parseInt(values["ge_bonus_mod"])||0;
+		var gebb = 0;
+		if ( ge >= 61 && ge <= 70 ) { gebb = 2; };
+		if ( ge >= 71 && ge <= 80 ) { gebb = 3; };
+		if ( ge >= 81 && ge <= 90 ) { gebb = 4; };
+		if ( ge >= 91 && ge <= 100 ) { gebb = 5; };
+		if ( ge >= 101 && ge <= 110 ) { gebb = 6; };
+		if ( ge >= 111 && ge <= 120 ) { gebb = 7; };
+		if ( ge >= 121 && ge <= 130 ) { gebb = 8; };
+		if ( ge >= 131 && ge <= 140 ) { gebb = 9; };
+		if ( ge >= 141 && ge <= 150 ) { gebb = 11; };
+		if ( ge >= 151 && ge <= 160 ) { gebb = 12; };
+		setAttrs({ ["ge_bonus_basis"]: gebb });
+		setAttrs({ ["ge_bonus"]: gebb + gebm });
 	});
 });
 
 /**KO-Bonus**/
-on("change:ko change:f_elite_training", function() {
-	getAttrs(["ko", "f_elite_training"], function(values) {
+on("change:ko change:ko_bonus_mod change:f_elite_training", function() {
+	getAttrs(["ko", "f_elite_training", "ko_bonus_mod"], function(values) {
 		var f_et = parseInt(values["f_elite_training"])||0;
-		var attr_ko = parseInt(values["ko"])||0;
-		var kb = f_et * 2;
-		if ( attr_ko >= 61 && attr_ko <= 70 ) { kb += 1; };
-		if ( attr_ko >= 71 && attr_ko <= 80 ) { kb += 2; };
-		if ( attr_ko >= 81 && attr_ko <= 90 ) { kb += 3; };
-		if ( attr_ko >= 91 && attr_ko <= 100 ) { kb += 4; };
-		if ( attr_ko >= 101 && attr_ko <= 110 ) { kb += 5; };
-		if ( attr_ko >= 111 && attr_ko <= 120 ) { kb += 6; };
-		if ( attr_ko >= 121 && attr_ko <= 130 ) { kb += 7; };
-		if ( attr_ko >= 131 && attr_ko <= 140 ) { kb += 8; };
-		if ( attr_ko >= 141 && attr_ko <= 150 ) { kb += 9; };
-		if ( attr_ko >= 151 && attr_ko <= 160 ) { kb += 10; };
-		setAttrs({ ["ko_bonus"]: kb});
+		var ko = parseInt(values["ko"])||0;
+		var kobm = parseInt(values["ko_bonus_mod"])||0;
+		var kobb = f_et * 2;
+		if ( ko >= 61 && ko <= 70 ) { kobb += 1; };
+		if ( ko >= 71 && ko <= 80 ) { kobb += 2; };
+		if ( ko >= 81 && ko <= 90 ) { kobb += 3; };
+		if ( ko >= 91 && ko <= 100 ) { kobb += 4; };
+		if ( ko >= 101 && ko <= 110 ) { kobb += 5; };
+		if ( ko >= 111 && ko <= 120 ) { kobb += 6; };
+		if ( ko >= 121 && ko <= 130 ) { kobb += 7; };
+		if ( ko >= 131 && ko <= 140 ) { kobb += 8; };
+		if ( ko >= 141 && ko <= 150 ) { kobb += 9; };
+		if ( ko >= 151 && ko <= 160 ) { kobb += 10; };
+		setAttrs({ ["ko_bonus_basis"]: kobb});
+		setAttrs({ ["ko_bonus"]: kobb + kobm });
 	});
 });
 
 /**Lernbonus**/
-on("change:kl change:in change:f_aussergewoehnliches_verstaendnis change:f_effektives_lernen change:f_weisheit_des_meisters", function() {
-	getAttrs(["kl","in", "f_aussergewoehnliches_verstaendnis", "f_effektives_lernen", "f_weisheit_des_meisters"], function(values) {
+on("change:kl change:in change:lernbonus_mod change:f_aussergewoehnliches_verstaendnis change:f_effektives_lernen change:f_weisheit_des_meisters", function() {
+	getAttrs(["kl","in", "f_aussergewoehnliches_verstaendnis", "f_effektives_lernen", "f_weisheit_des_meisters", "lernbonus_mod"], function(values) {
 		var attr_kl = parseInt(values["kl"])||0;
 		var attr_in = parseInt(values["in"])||0;
+		var lbm = parseInt(values["lernbonus_mod"])||0;
 		var f_av = parseInt(values["f_aussergewoehnliches_verstaendnis"])||0;
 		var f_el = parseInt(values["f_effektives_lernen"])||0;
 		var f_wdm = parseInt(values["f_weisheit_des_meisters"])||0;
@@ -2887,7 +3023,8 @@ on("change:kl change:in change:f_aussergewoehnliches_verstaendnis change:f_effek
 		if ( kl_in > 130 && kl_in < 141 ) { lern_gesamt = lern_sf + 40; };
 		if ( kl_in > 140 && kl_in < 151 ) { lern_gesamt = lern_sf + 41; };
 		if ( kl_in > 150 && kl_in < 161 ) { lern_gesamt = lern_sf + 42; };
-		setAttrs({ "lernbonus": lern_gesamt });
+		setAttrs({ "lernbonus_basis": lern_gesamt });
+		setAttrs({ "lernbonus": lern_gesamt + lbm });
 	});
 });
 
@@ -2918,7 +3055,7 @@ attribute.forEach(function (attribut) {
 		getAttrs([attribut, attribut + "_name", attribut + "_anzahl"], function(values) {
 			var att = parseInt(values[attribut])||0;
 			var att_name = values[attribut + "_name"];
-			startRoll("/w gm &{template:basic} {{type=Attribut}} {{name=" + att_name + "}} {{wert=[[" + att +"]]}} {{check=[[1d100cs<1cf>100+?{Manuel|0}]]}}", function(results) {
+			startRoll("&{template:basic} {{type=Attribut}} {{name=" + att_name + "}} {{wert=[[" + att +"]]}} {{check=[[1d100cs<1cf>100+?{Manuel|0}]]}}", function(results) {
 				var wrt = results.results.wert.result;
 				var chk = results.results.check.result;
 				finishRoll(results.rollId);
@@ -3018,7 +3155,7 @@ berechnete_werte.forEach(function (bw) {
 		getAttrs([bw, bw + "_name", bw + "_anzahl"], function(values) {
 			var att = parseInt(values[bw])||0;
 			var att_name = values[bw + "_name"];
-			startRoll("/w gm &{template:basic} {{type=Attribut}} {{name=" + att_name + "}} {{wert=[[" + att +"]]}} {{check=[[1d100cs<1cf>100+?{Manuel|0}]]}}", function(results) {
+			startRoll("&{template:basic} {{type=Attribut}} {{name=" + att_name + "}} {{wert=[[" + att +"]]}} {{check=[[1d100cs<1cf>100+?{Manuel|0}]]}}", function(results) {
 				var wrt = results.results.wert.result;
 				var chk = results.results.check.result;
 				finishRoll(results.rollId);
@@ -3062,6 +3199,7 @@ on("change:f_zen_bogenschuetze change:kl change:ge change:kk change:in", functio
 		setAttrs({ ["fba_basis"]: fbab });
 	});
 });
+
 /**Berechnung des Rückzugs**/
 on("change:mu change:in change:ge change:f_fluchtreflexe", function() {
 	getAttrs(["mu", "ge", "in"], function(values) {
@@ -3072,6 +3210,7 @@ on("change:mu change:in change:ge change:f_fluchtreflexe", function() {
 		setAttrs({ ["rz_basis"]: rzb });
 	});
 });
+
 /**Berechnung des Rennen-Werts**/
 on("change:rw change:ge change:kk change:cm change:kg", function() {
 	getAttrs(["rw", "ge", "kk", "cm", "kg"], function(values) {
@@ -3333,6 +3472,16 @@ on("change:repeating_abenteuer:abenteuer_ep remove:repeating_abenteuer", functio
 	repeatingSum("ep_abenteuer","abenteuer","abenteuer_ep");
 });
 
+/**Berechnung EP für die Archetyp-Laufbahnen**/
+on("change:repeating_archetyp:archetyp_ep_anfang change:repeating_archetyp:archetyp_ep_ende", function(eventInfo) {
+	var id = eventInfo.sourceAttribute.match(/-(.*?)(?=_)/g);
+	getAttrs(["repeating_archetyp_archetyp_ep_anfang", "repeating_archetyp_archetyp_ep_ende"], function(values) {
+		var ep_a = parseInt(values["repeating_archetyp_archetyp_ep_anfang"])||0;
+		var ep_e = parseInt(values["repeating_archetyp_archetyp_ep_ende"])||0;
+		var ep_g = ep_e - ep_a;
+		setAttrs({ ["repeating_archetyp_" + id + "_archetyp_ep_gesamt"]: ep_g });
+	});
+});
 
 /**Beginn Zauber**/
 /**Zum Aufruf des Action-Button für die Probe von Zaubern notwendig**/
@@ -3352,34 +3501,46 @@ on("change:repeating_zauber:zauber_name change:name", function(eventInfo) {
 /**Probe-Roll für Zauber inkl. automatischen und manuellen Bonus**/
 on("clicked:repeating_zauber:zauber-probe", function(eventInfo) {
 	var id = eventInfo.sourceAttribute.match(/-(.*?)(?=_)/g);
-	getAttrs(["mb", "repeating_zauber_zauber_mod", "repeating_zauber_zauber_name", "repeating_zauber_zauber_anzahl", "zauber_quinkie", "zauber_marjag", "zauber_marjag_mod"], function(values) {
+	getAttrs(["mb", "mb_bonus", "repeating_zauber_zauber_me", "repeating_zauber_zauber_mod", "repeating_zauber_zauber_name", "repeating_zauber_zauber_anzahl", "zauber_quinkie", "zauber_marjag", "zauber_marjag_mod", "me", "au"], function(values) {
 		var att_mb = parseInt(values["mb"])||0;
+		var att_mb_bonus = parseInt(values["mb_bonus"])||0;
+		var att_me = parseInt(values["me"])||0;
+		var att_au = parseInt(values["au"])||0;
+		var zau_me = parseInt(values["repeating_zauber_zauber_me"])||0;
 		var zau_mod = parseInt(values["repeating_zauber_zauber_mod"])||0;
 		var zau_name = values["repeating_zauber_zauber_name"];
 		var zau_anzahl = parseInt(values["repeating_zauber_zauber_anzahl"])||0;;
 		var zau_quinki = parseInt(values["zauber_quinkie"])||0;;
-		var zau_marjag = parseInt(values["zauber_marjag"])||0;;
-		var zau_m_mod = parseInt(values["zauber_marjag_mod"])||0;;
-		if ( zau_marjag == 0 ) {
-			zau_m_mod = 0;
-		};
-		if ( zau_quinki == 0 ) {
-			startRoll("/w gm &{template:zauber} {{type=Zauber}} {{name=" + zau_name + "}} {{wert=[[" + att_mb + " + " + zau_m_mod + "]]}} {{check=[[1d100cs<1cf>100+" + zau_mod +"+?{Manuel|0}]]}} {{quinki=[[0]]}}", function(results) {
-				var wrt = results.results.wert.result;
-				var chk = results.results.check.result;
-				zau_anzahl++;
-				setAttrs({ ["repeating_zauber_" + id + "_zauber_anzahl"]: zau_anzahl });
-				finishRoll(results.rollId);
-			});
+		var zau_au = Math.ceil(zau_me/10);
+		var att_me_neu = att_me - zau_me;
+		var att_au_neu = att_au - zau_au;
+		if (( att_au < zau_au ) || ( att_me < zau_me )) {
+				startRoll("&{template:zauber} {{type=Zauber}} {{name=" + zau_name + "}} {{wert=[[" + att_mb + " + " + att_mb_bonus + "]]}} {{attrcheck=[[1]]}}", function(results) {
+					finishRoll(results.rollId);
+				});
 		} else {
-			startRoll("/w gm &{template:zauber} {{type=Zauber}} {{name=" + zau_name + "}} {{wert=[[" + att_mb + " + " + zau_m_mod + "]]}} {{check=[[1d100cs<1cf>100+" + zau_mod +"+?{Manuel|0}]]}} {{quinki=[[1]]}}  {{qcheck=[[1d100cf>100]]}}", function(results) {
-				var wrt = results.results.wert.result;
-				var chk = results.results.check.result;
-				zau_anzahl++;
-				setAttrs({ ["repeating_zauber_" + id + "_zauber_anzahl"]: zau_anzahl });
-				finishRoll(results.rollId);
-			});
-		};
+			if ( zau_quinki == 0 ) {
+				startRoll("&{template:zauber} {{type=Zauber}} {{name=" + zau_name + "}} {{wert=[[" + att_mb + " + " + att_mb_bonus + "]]}} {{check=[[1d100cs<1cf>100+" + zau_mod + "]]}} {{attrcheck=[[0]]}} {{quinki=[[0]]}}", function(results) {
+					var wrt = results.results.wert.result;
+					var chk = results.results.check.result;
+					zau_anzahl++;
+					setAttrs({ ["repeating_zauber_" + id + "_zauber_anzahl"]: zau_anzahl });
+					setAttrs({ ["me"]: att_me_neu });
+					setAttrs({ ["au"]: att_au_neu });
+					finishRoll(results.rollId);
+				});
+			} else {
+				startRoll("&{template:zauber} {{type=Zauber}} {{name=" + zau_name + "}} {{wert=[[" + att_mb + " + " + att_mb_bonus + "]]}} {{check=[[1d100cs<1cf>100+" + zau_mod + "]]}} {{attrcheck=[[0]]}} {{quinki=[[1]]}}  {{qcheck=[[1d100cf>100]]}}", function(results) {
+					var wrt = results.results.wert.result;
+					var chk = results.results.check.result;
+					zau_anzahl++;
+					setAttrs({ ["repeating_zauber_" + id + "_zauber_anzahl"]: zau_anzahl });
+					setAttrs({ ["me"]: att_me_neu });
+					setAttrs({ ["au"]: att_au_neu });
+					finishRoll(results.rollId);
+				});
+			};
+		}; 
 	});		
 });
 
@@ -3410,6 +3571,7 @@ on("change:repeating_zauber:zauber_ep_kosten remove:repeating_zauber", function(
 });
 
 
+/**Beginn Psi-Kräfte**/
 /**Zum Aufruf des Action-Button für die Probe von Psi-Kräften notwendig**/
 on("change:repeating_psi:psi_name change:name", function(eventInfo) {
 	getAttrs(["name"], function(values) {
@@ -3427,30 +3589,46 @@ on("change:repeating_psi:psi_name change:name", function(eventInfo) {
 /**Probe-Roll für Psi-Kräfte inkl. automatischen und manuellen Bonus**/
 on("clicked:repeating_psi:psi-probe", function(eventInfo) {
 	var id = eventInfo.sourceAttribute.match(/-(.*?)(?=_)/g);
-	getAttrs(["in", "kl", "repeating_psi_psi_mod", "repeating_psi_psi_name", "repeating_psi_psi_anzahl", "repeating_psi_psi_attribut"], function(values) {
+	getAttrs(["in", "kl", "repeating_psi_psi_mod", "repeating_psi_psi_name", "repeating_psi_psi_pp", "repeating_psi_psi_anzahl", "repeating_psi_psi_attribut", "pp", "au"], function(values) {
 		var psi_att = parseInt(values["repeating_psi_psi_attribut"])||0;
 		var prb_att = -1;
+		var att_pp = parseInt(values["pp"])||0;
+		var att_au = parseInt(values["au"])||0;
+		var psi_pp = parseInt(values["repeating_psi_psi_pp"])||0;
 		var psi_mod = parseInt(values["repeating_psi_psi_mod"])||0;
 		var psi_name = values["repeating_psi_psi_name"];
 		var psi_anzahl = parseInt(values["repeating_psi_psi_anzahl"])||0;;
-		if ( psi_att == 0 ) {
-			prb_att = parseInt(values["in"])||0;
-			startRoll("/w gm &{template:psi} {{type=Psi-Kraft}} {{attribut=Intuition}} {{name=" + psi_name + "}} {{wert=[[" + prb_att + " - (" + psi_mod + ")]]}} {{check=[[1d100cs<1cf>100+?{Manuel|0}]]}}", function(results) {
-				var wrt = results.results.wert.result;
-				var chk = results.results.check.result;
-				psi_anzahl++;
-				setAttrs({ ["repeating_psi_" + id + "_psi_anzahl"]: psi_anzahl });
-				finishRoll(results.rollId);
-			});
+		var psi_au = Math.ceil(psi_pp/10);
+		var att_pp_neu = att_pp - psi_pp;
+		var att_au_neu = att_au - psi_au;
+		if (( att_au < psi_au ) || ( att_pp < psi_pp )) {
+				startRoll("&{template:psi} {{type=Psi-Kraft}} {{name=" + psi_name + "}} {{attrcheck=[[1]]}}", function(results) {
+					finishRoll(results.rollId);
+				});
 		} else {
-			prb_att = parseInt(values["kl"])||0;
-			startRoll("/w gm &{template:psi} {{type=Psi-Kraft}} {{attribut=Klugheit}} {{name=" + psi_name + "}} {{wert=[[" + prb_att + " - (" + psi_mod + ")]]}} {{check=[[1d100cs<1cf>100+?{Manuel|0}]]}}", function(results) {
-				var wrt = results.results.wert.result;
-				var chk = results.results.check.result;
-				psi_anzahl++;
-				setAttrs({ ["repeating_psi_" + id + "_psi_anzahl"]: psi_anzahl });
-				finishRoll(results.rollId);
-			});
+			if ( psi_att == 0 ) {
+				prb_att = parseInt(values["in"])||0;
+				startRoll("&{template:psi} {{type=Psi-Kraft}} {{attribut=Intuition}} {{name=" + psi_name + "}} {{wert=[[" + prb_att + "]]}} {{check=[[1d100cs<1cf>100+" + psi_mod + "]]}} {{attrcheck=[[0]]}}", function(results) {
+					var wrt = results.results.wert.result;
+					var chk = results.results.check.result;
+					psi_anzahl++;
+					setAttrs({ ["repeating_psi_" + id + "_psi_anzahl"]: psi_anzahl });
+					setAttrs({ ["pp"]: att_pp_neu });
+					setAttrs({ ["au"]: att_au_neu });
+					finishRoll(results.rollId);
+				});
+			} else {
+				prb_att = parseInt(values["kl"])||0;
+				startRoll("&{template:psi} {{type=Psi-Kraft}} {{attribut=Klugheit}} {{name=" + psi_name + "}} {{wert=[[" + prb_att + "]]}} {{check=[[1d100cs<1cf>100+" + psi_mod + "]]}} {{attrcheck=[[0]]}}", function(results) {
+					var wrt = results.results.wert.result;
+					var chk = results.results.check.result;
+					psi_anzahl++;
+					setAttrs({ ["repeating_psi_" + id + "_psi_anzahl"]: psi_anzahl });
+					setAttrs({ ["pp"]: att_pp_neu });
+					setAttrs({ ["au"]: att_au_neu });
+					finishRoll(results.rollId);
+				});
+			};
 		};
 	});		
 });
@@ -3795,6 +3973,18 @@ on("change:f_remove", function(eventInfo) {
 
 
 /**Beginn Ausrüstung**/
+/**Summe Gewicht des Geldes**/
+on("change:platin change:gold change:silber change:bronze", function() {
+	getAttrs(["platin", "gold", "silber", "bronze"], function(values) {
+		var p = parseInt(values["platin"])||0;
+		var g = parseInt(values["gold"])||0;
+		var s = parseInt(values["silber"])||0;
+		var b = parseInt(values["bronze"])||0;
+		var gewicht = ((p * 10) + (g * 25) + (s * 10) + (b * 10)) / 1000;
+		setAttrs({ ["geld_gesamtgewicht"]: gewicht});
+	});
+});
+
 /**Summe Gewicht der Kleidung**/
 on("change:repeating_kleidung:kleidung_gewicht remove:repeating_kleidung", function() {
 	repeatingSum("kleidung_gesamtgewicht","kleidung","kleidung_gewicht");
@@ -3829,10 +4019,12 @@ on("change:repeating_ggstrt2:ggstrt2_gewicht remove:repeating_ggstrt2", function
 on("change:kleidung_gesamtgewicht change:tasche1_gesamtgewicht change:tasche2_gesamtgewicht" +
 	" change:tasche3_gesamtgewicht change:kk change:f_aussergewoehnliche_tragkraft" +
 	" change:ausruestung_kleidung change:ausruestung_tasche1 change:ausruestung_tasche2" +
-	" change:ausruestung_tasche3", function() {
+	" change:ausruestung_tasche3 change:geld_gesamtgewicht change:ausruestung_geld", function() {
 	getAttrs(["kleidung_gesamtgewicht", "tasche1_gesamtgewicht", "tasche2_gesamtgewicht", "tasche3_gesamtgewicht", 
 		"kk", "f_aussergewoehnliche_tragkraft", "ausruestung_kleidung", "ausruestung_tasche1", "ausruestung_tasche2",
-		"ausruestung_tasche3"], function(values) {
+		"ausruestung_tasche3", "geld_gesamtgewicht", "ausruestung_geld"], function(values) {
+		var gw_g = parseFloat(values["geld_gesamtgewicht"])||0;
+		var c_g = parseInt(values["ausruestung_geld"])||0;
 		var gw_k = parseFloat(values["kleidung_gesamtgewicht"])||0;
 		var c_k = parseInt(values["ausruestung_kleidung"])||0;
 		var gw_t1 = parseFloat(values["tasche1_gesamtgewicht"])||0;
@@ -3841,7 +4033,7 @@ on("change:kleidung_gesamtgewicht change:tasche1_gesamtgewicht change:tasche2_ge
 		var c_t2 = parseInt(values["ausruestung_tasche2"])||0;
 		var gw_t3 = parseFloat(values["tasche3_gesamtgewicht"])||0;
 		var c_t3 = parseInt(values["ausruestung_tasche2"])||0;
-		var gg = (c_k * gw_k) + (c_t1 * gw_t1) + (c_t2 * gw_t2) + (c_t3 * gw_t3);
+		var gg = (c_g * gw_g) + (c_k * gw_k) + (c_t1 * gw_t1) + (c_t2 * gw_t2) + (c_t3 * gw_t3);
 		setAttrs({ ["ausruestung_gesamtgewicht"]: gg });
 		var kk = parseInt(values["kk"])||0;
 		var f = parseInt(values["f_aussergewoehnliche_tragkraft"])||0;
@@ -4034,7 +4226,9 @@ talents.forEach(function (talent) {
 			var tal_bonus = parseInt(values[talent + "_bonus"])||0;
 			var tal_name = values[talent + "_name"];
 			var tal_anzahl = parseInt(values[talent + "_anzahl"])||0;;
-			var gm_tal = ["Charakter erkennen", "Fallenstellen und finden", "Gefahreninstinkt", "Lügen", "Schätzen", "Sich verstecken", "Spot Hidden"];
+			var gmt1 = ["Bestechen", "Betören", "Charakter erkennen", "Fallenstellen und finden", "Falschspiel", "Gefahreninstinkt"]
+			var gmt2 = ["Lügen", "Orientierung", "Schätzen", "Schleichen*", "Sich verstecken", "Spot Hidden", "Taschendiebstahl*"];
+			var gm_tal = [].concat(gmt1, gmt2);
 			var gm_w = "";
 			for (var i=0; i < gm_tal.length; i++) {
 				if (tal_name == gm_tal[i]) {
@@ -4138,7 +4332,7 @@ on("clicked:repeating_skills:skill-probe", function(eventInfo) {
 		var tal_bonus = parseInt(values["repeating_skills_skill_bonus"])||0;
 		var tal_name = values["repeating_skills_skill_name"];
 		var tal_anzahl = parseInt(values["repeating_skills_skill_anzahl"])||0;;
-		startRoll("/w gm &{template:basic} {{type=Talent}} {{name=" + tal_name + "}} {{wert=[[" + tal + " + " + tal_bonus + "]]}} {{check=[[1d100cs<1cf>100+?{Manuel|0}]]}}", function(results) {
+		startRoll("&{template:basic} {{type=Talent}} {{name=" + tal_name + "}} {{wert=[[" + tal + " + " + tal_bonus + "]]}} {{check=[[1d100cs<1cf>100+?{Manuel|0}]]}}", function(results) {
 			var wrt = results.results.wert.result;
 			var chk = results.results.check.result;
 			tal_anzahl++;
@@ -4156,7 +4350,7 @@ on("clicked:repeating_berufe:beruf-probe", function(eventInfo) {
 		var tal_bonus = parseInt(values["repeating_berufe_beruf_bonus"])||0;
 		var tal_name = values["repeating_berufe_beruf_name"];
 		var tal_anzahl = parseInt(values["repeating_berufe_beruf_anzahl"])||0;;
-		startRoll("/w gm &{template:basic} {{type=Talent}} {{name=" + tal_name + "}} {{wert=[[" + tal + " + " + tal_bonus + "]]}} {{check=[[1d100cs<1cf>100+?{Manuel|0}]]}}", function(results) {
+		startRoll("&{template:basic} {{type=Talent}} {{name=" + tal_name + "}} {{wert=[[" + tal + " + " + tal_bonus + "]]}} {{check=[[1d100cs<1cf>100+?{Manuel|0}]]}}", function(results) {
 			var wrt = results.results.wert.result;
 			var chk = results.results.check.result;
 			tal_anzahl++;