diff --git a/CHANGELOG.md b/CHANGELOG.md
index 886fc73..fa627d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,7 @@
 # 0.01
 - Initial release
 # 0.02
-- Kritische Tabellen
\ No newline at end of file
+- Kritische Tabellen
+# 0.03
+- Makros für Standardwürfel (W6. W20. W100)
+- Blaupausen für Spielerffiguren und Nichtspielerfiguren
\ No newline at end of file
diff --git a/README.md b/README.md
index 4030528..a8fad77 100644
--- a/README.md
+++ b/README.md
@@ -5,16 +5,17 @@
 <p>Midgard is the oldest German Role Playing Game. It was created by J&uuml;rgen Franke back in 1981.&nbsp;</p>
 <p>The link to the official (German) site (and shop): <a href="https://midgard-online.de/startseite.html">midgard-online.de</a></p>
 <p>The link to Wikipedia in English:&nbsp; <a href="https://en.wikipedia.org/wiki/Midgard_(role-playing_game)">Midgard role playing game</a></p>
+<p>Link to documentation: <a href="https://www.midgard-forum.de/forum/articles.html/formblaetter_datenblaetter_spielhilfen/midgard-als-system-für-foundryvtt-r1754/">Midgard-Forum</a></p>
 <p>&nbsp;</p>
 <h2>Features</h2>
 <p>&nbsp;</p>
-<p>Only a very basic system right now. Everything you need to run a combat (healthbar, endurance, initiative for the combat tracker).</p>
+<p>Only a very basic system right now. Everything you need to run a combat (healthbar, endurance, initiative for the combat tracker).<br/>I've added rollable tables, Macros for using them and Macros for standard dices (D6, D20, D100</p>
 <p>&nbsp;</p>
 <h2>ToDo:</h2>
 <p>&nbsp;</p>
 <ul>
 <li>Character sheet</li>
-<li>Tables for critical rolls&nbsp;</li>
+<li>Tables for critical rolls (already implemented in a rudimentary way)</li>
 <li>Modification of the standard combat tracker to fit the Midgard specific battle round rules</li>
 <li>Modification of the dice roller (detection of critical rolls and practice points)</li>
 </ul>
diff --git a/packs/actors/blaupause-spielfiguren.db b/packs/actors/blaupause-spielfiguren.db
new file mode 100644
index 0000000..cbc0b22
--- /dev/null
+++ b/packs/actors/blaupause-spielfiguren.db
@@ -0,0 +1,2 @@
+{"_id":"9d4uk6kRSl6R3RQW","name":"Blaupause NSpF","permission":{"default":0,"CBq5YXAqbO7HoJ03":3},"type":"npc","data":{"lp":{"value":15,"min":0,"max":15},"ap":{"value":20,"min":0,"max":20},"gw":{"value":50,"bonus":0},"description":" "},"sort":100001,"flags":{"core":{"sourceId":"Compendium.midgard5.blaupause-spielfiguren.UZ24J3Izksd0gNfR"}},"img":"icons/svg/wing.svg","token":{"flags":{},"name":"Blaupause NSpF","displayName":30,"img":"icons/svg/wing.svg","tint":"","width":1,"height":1,"scale":1,"mirrorX":false,"mirrorY":false,"lockRotation":false,"rotation":0,"vision":true,"dimSight":0,"brightSight":0,"dimLight":0,"brightLight":0,"sightAngle":360,"lightAngle":360,"lightColor":"","lightAlpha":1,"lightAnimation":{"type":"","speed":5,"intensity":5},"actorId":"9d4uk6kRSl6R3RQW","actorLink":true,"disposition":-1,"displayBars":30,"bar1":{"attribute":"lp"},"bar2":{"attribute":"ap"},"randomImg":false},"items":[],"effects":[]}
+{"_id":"FeM5qp9YncZX61nj","name":"Blaupause Spielerfigur","permission":{"default":0,"CBq5YXAqbO7HoJ03":3},"type":"character","data":{"lp":{"value":15,"min":0,"max":15},"ap":{"value":20,"min":0,"max":20},"gw":{"value":50,"bonus":0},"description":" "},"sort":100001,"flags":{"core":{"sourceId":"Compendium.world.blaupause-spielfiguren.t9eB2RdE1n9wV8eq"}},"img":"icons/svg/aura.svg","token":{"flags":{},"name":"Blaupause Spielfigur","displayName":30,"img":"icons/svg/aura.svg","tint":"","width":1,"height":1,"scale":1,"mirrorX":false,"mirrorY":false,"lockRotation":false,"rotation":0,"vision":true,"dimSight":0,"brightSight":0,"dimLight":0,"brightLight":0,"sightAngle":360,"lightAngle":360,"lightColor":"","lightAlpha":1,"lightAnimation":{"type":"","speed":5,"intensity":5},"actorId":"FeM5qp9YncZX61nj","actorLink":true,"disposition":1,"displayBars":30,"bar1":{"attribute":"lp"},"bar2":{"attribute":"ap"},"randomImg":false},"items":[],"effects":[]}
diff --git a/packs/makros-kritische-ereignisse.db b/packs/macros/makros-kritische-ereignisse.db
similarity index 100%
rename from packs/makros-kritische-ereignisse.db
rename to packs/macros/makros-kritische-ereignisse.db
diff --git a/packs/macros/makros-standardwurfel.db b/packs/macros/makros-standardwurfel.db
new file mode 100644
index 0000000..f09b9bb
--- /dev/null
+++ b/packs/macros/makros-standardwurfel.db
@@ -0,0 +1,3 @@
+{"name":"1W6","permission":{"default":2,"CBq5YXAqbO7HoJ03":3},"type":"chat","flags":{"core":{"sourceId":"Macro.QBhV6De80g1wH6ot"}},"scope":"global","command":"/r 1d6","author":"CBq5YXAqbO7HoJ03","img":"icons/svg/d6-grey.svg","actorIds":[],"_id":"5tpfRgbM5sTL9gur"}
+{"name":"1W100","permission":{"default":2,"CBq5YXAqbO7HoJ03":3},"type":"chat","flags":{"core":{"sourceId":"Macro.TqmUKpMpY4GhiTML"}},"scope":"global","command":"/r 1d100","author":"CBq5YXAqbO7HoJ03","img":"icons/svg/circle.svg","actorIds":[],"_id":"YWsPRUpZpgLBKIB3"}
+{"name":"1W20","permission":{"default":2,"CBq5YXAqbO7HoJ03":3},"type":"chat","flags":{"core":{"sourceId":"Macro.S01PfXnvLPeuKOH8"}},"scope":"global","command":"/r 1d20","author":"CBq5YXAqbO7HoJ03","img":"icons/svg/d20-grey.svg","actorIds":[],"_id":"pXZIfqDIX9VKYonr"}
diff --git a/packs/tabellen-kritische-ereignisse.db b/packs/rolltables/tabellen-kritische-ereignisse.db
similarity index 100%
rename from packs/tabellen-kritische-ereignisse.db
rename to packs/rolltables/tabellen-kritische-ereignisse.db
diff --git a/system.json b/system.json
index 8e27ec3..2bdffd3 100644
--- a/system.json
+++ b/system.json
@@ -2,7 +2,7 @@
     "name": "midgard5",
     "title": "Midgard 5. Edition",
     "description": "The German RPG Midgard 5. Edition",
-    "version": 0.02,
+    "version": 0.03,
     "minimumCoreVersion": "0.7.9",
     "compatibleCoreVersion": "0.7.9",
     "templateVersion": 2,
@@ -14,18 +14,30 @@
       "midgard5.css"
     ], 
     "packs": [
+      {
+        "name": "blaupause-spielfiguren",
+        "label": "Blaupausen für Spielfiguren",
+        "path": "./packs/actors/blaupause-spielfiguren.db",
+        "entity": "Actor"
+      },
       {
         "name": "tabellen-kritische-ereignisse",
         "label": "Tabellen Kritische Ereignisse",
-        "path": "./packs/tabellen-kritische-ereignisse.db",
+        "path": "./packs/rolltables/tabellen-kritische-ereignisse.db",
         "entity": "RollTable"
       },
       {
         "name": "makros-kritische-ereignisse",
         "label": "Makros Kritische Ereignisse",
-        "path": "./packs/makros-kritische-ereignisse.db",
+        "path": "./packs/macros/makros-kritische-ereignisse.db",
         "entity": "Macro"
-      }
+      },
+      {
+        "name": "makros-standardwurfel",
+        "label": "Standardwürfel",
+        "path": "./packs/macros/makros-standardwurfel.db",
+        "entity": "Macro"
+      } 
     ],
     "languages": [
       {
@@ -40,7 +52,7 @@
     "secondaryTokenAttribute": "ap",
     "url": "https://github.com/hjmaier/midgard5",
     "manifest": "https://raw.githubusercontent.com/hjmaier/midgard5/main/system.json",
-    "download": "https://github.com/hjmaier/midgard5/archive/V0.02.zip",
+    "download": "https://github.com/hjmaier/midgard5/archive/V0.03.zip",
     "initiative": "@gw.value + @gw.bonus",
     "license": "LICENSE.txt"
 }
diff --git a/template.json b/template.json
index 515f860..7fa96eb 100644
--- a/template.json
+++ b/template.json
@@ -10,14 +10,14 @@
         },
         "characterBars":{
             "lp":{
-               "value":10,
+               "value":15,
                "min":0,
-               "max":10
+               "max":15
             },
             "ap":{
-               "value":5,
+               "value":20,
                "min":0,
-               "max":5
+               "max":20
             }
         },
         "attributes":{