diff --git a/WorldDawnSimpleTest/.obsidian/types.json b/WorldDawnSimpleTest/.obsidian/types.json
index 91d3ec0..fd29ab6 100644
--- a/WorldDawnSimpleTest/.obsidian/types.json
+++ b/WorldDawnSimpleTest/.obsidian/types.json
@@ -15,6 +15,10 @@
     "data.race.maxheight": "number",
     "data.race.maxage": "number",
     "data.race.minage": "number",
-    "cost.1": "number"
+    "cost.1": "number",
+    "item": "checkbox",
+    "weapon": "checkbox",
+    "damage": "text",
+    "item.slots": "number"
   }
 }
\ No newline at end of file
diff --git a/WorldDawnSimpleTest/.obsidian/workspace.json b/WorldDawnSimpleTest/.obsidian/workspace.json
index 31d0ca9..5cc0d42 100644
--- a/WorldDawnSimpleTest/.obsidian/workspace.json
+++ b/WorldDawnSimpleTest/.obsidian/workspace.json
@@ -4,11 +4,11 @@
     "type": "split",
     "children": [
       {
-        "id": "020f3644f1d53ff7",
+        "id": "e73751d8cb038856",
         "type": "tabs",
         "children": [
           {
-            "id": "388abadcb3247db6",
+            "id": "8b8db8934e706fc6",
             "type": "leaf",
             "state": {
               "type": "empty",
@@ -179,25 +179,25 @@
       "bases:Create new base": false
     }
   },
-  "active": "f04c5c8ea681e8c9",
+  "active": "8b8db8934e706fc6",
   "lastOpenFiles": [
-    "wiki/costtables/CostTable.base",
-    "wiki/costtables/Attribute A.md",
+    "wiki/weapons/Axt.md",
     "wiki/weapons/Spear.md",
+    "wiki/weapons/Sword.md",
+    "wiki/weapons/Items.base",
+    "wiki/weapons/Items.base",
+    "wiki/costtables/Attribute A.md",
+    "wiki/costtables/CostTable.base",
     "wiki/races/Races.base",
     "wiki/races/Orc.md",
     "wiki/races/Human.md",
     "wiki/races/Dragon.md",
     "wiki/first subfolder/secondSub/Some Testnote.md",
     "wiki/costtables",
-    "wiki/weapons/Items.base",
     "wiki/races",
-    "wiki/weapons/Sword.md",
-    "wiki/weapons/Axt.md",
     "wiki/twomain/A Pdf.pdf",
     "wiki/Test123.md",
     "wiki/Authbased.md",
-    "wiki/weapons/Untitled.base",
     "Untitled.md",
     "wiki/weapons",
     "wiki/twomain/Hallo Welt.md",
diff --git a/WorldDawnSimpleTest/wiki/weapons/Axt.md b/WorldDawnSimpleTest/wiki/weapons/Axt.md
index 82b686e..7bb3450 100644
--- a/WorldDawnSimpleTest/wiki/weapons/Axt.md
+++ b/WorldDawnSimpleTest/wiki/weapons/Axt.md
@@ -1,8 +1,7 @@
 ---
-data.weapon: true
-data.weapon.damage: 2W4 + 1
-data.weapon.cost: 800
-data.tool: true
-data.tool.task: Woodcutting
+item: true
+item.cost: "250"
+item.slots: 1
 ---
+
 # Axtno
\ No newline at end of file
diff --git a/WorldDawnSimpleTest/wiki/weapons/Items.base b/WorldDawnSimpleTest/wiki/weapons/Items.base
index d801e6c..bec3108 100644
--- a/WorldDawnSimpleTest/wiki/weapons/Items.base
+++ b/WorldDawnSimpleTest/wiki/weapons/Items.base
@@ -1,32 +1,26 @@
 filters:
   and:
-    - note["data.weapon"] == true
-formulas:
-  Untitled: note["data.weapon.cost"] + 20
-properties:
-  formula.Untitled:
-    displayName: Cost Increased
+    - item == true
 views:
   - type: table
-    name: Weapons
+    name: All
     order:
       - file.name
-      - data.weapon.damage
-      - data.weapon.cost
-      - formula.Untitled
-    sort:
-      - property: file.name
-        direction: ASC
-      - property: formula.Untitled
-        direction: ASC
-      - property: data.waffe.damage
-        direction: DESC
-    columnSize:
-      note.data.weapon.damage: 190
+      - item.cost
   - type: table
-    name: Tools
+    name: Weapons
     filters:
       and:
-        - note["data.tool"] == true
+        - weapon == true
     order:
       - file.name
+      - item.cost
+      - weapon.damage
+  - type: table
+    name: Items
+    filters:
+      and:
+        - weapon != true
+    order:
+      - file.name
+      - item.cost
diff --git a/WorldDawnSimpleTest/wiki/weapons/Spear.md b/WorldDawnSimpleTest/wiki/weapons/Spear.md
index 7a701c2..80648ca 100644
--- a/WorldDawnSimpleTest/wiki/weapons/Spear.md
+++ b/WorldDawnSimpleTest/wiki/weapons/Spear.md
@@ -1,7 +1,10 @@
 ---
-data.weapon: true
-data.weapon.cost: 800
-data.weapon.damage: 1W6 + 1
+item: true
+weapon: true
+item.cost: "500"
+weapon.damage: 3W4 + 1
+item.slots: 3
 ---
+
 # Spear
 The Spear is a long stick with a pointy end.
\ No newline at end of file
diff --git a/WorldDawnSimpleTest/wiki/weapons/Sword.md b/WorldDawnSimpleTest/wiki/weapons/Sword.md
index 25ce027..1715bc7 100644
--- a/WorldDawnSimpleTest/wiki/weapons/Sword.md
+++ b/WorldDawnSimpleTest/wiki/weapons/Sword.md
@@ -1,7 +1,10 @@
 ---
-data.weapon: true
-data.weapon.damage: 1W6 + 2
-data.weapon.cost: 1500
+item: true
+weapon: true
+weapon.damage: 2W6 + 2 + QS
+item.cost: "750"
+item.slots: 2
 ---
+
 # Sword
 Forged by a smith, this piece of metal is making you bleed.
\ No newline at end of file
diff --git a/tools/charactercreation/characterdata.xml b/tools/charactercreation/characterdata.xml
index 4014bfa..8bce8d1 100644
--- a/tools/charactercreation/characterdata.xml
+++ b/tools/charactercreation/characterdata.xml
@@ -11,13 +11,13 @@
         <Group Name="control">
             <Variables>
                 <Int Name="startxp">
-                    <Value>925</Value>
+                    <Value>950</Value>
                 </Int>
                 <Int Name="maxxp">
-                    <Value>925</Value>
+                    <Value>950</Value>
                 </Int>
                 <Int Name="xp">
-                    <Value>925</Value>
+                    <Value>950</Value>
                 </Int>
                 <Int Name="coins">
                     <Value>75000</Value>
@@ -184,7 +184,17 @@
                 <Int Name="pa_brawling"/>
                 <Int Name="pa_shields"/>
                 <Int Name="pa_swords"/>
-
+            </Variables>
+        </Group>
+        <Group Name="items">
+            <Variables>
+                <List Name="weapons">
+                    <Variables>
+                        <String Name="name"/>
+                        <Int Name="cost"/>
+                        <String Name="damage"/>
+                    </Variables>
+                </List>
             </Variables>
         </Group>
     </Groups>
diff --git a/tools/charactercreation/charactertool.xml b/tools/charactercreation/charactertool.xml
index f045b6f..19fa257 100644
--- a/tools/charactercreation/charactertool.xml
+++ b/tools/charactercreation/charactertool.xml
@@ -142,22 +142,22 @@
                  <!-- Header Bar -->
                  <Bar>
                      <Displays>
-                         <BarDisplay>
+                         <NameValueDisplay>
                              <Name>"Name"</Name>
                              <Value>[data.character.definition.name]</Value>
-                         </BarDisplay>
-                         <BarDisplay>
+                         </NameValueDisplay>
+                         <NameValueDisplay>
                              <Name>"Rasse"</Name>
                              <Value>[data.character.race.name]</Value>
-                         </BarDisplay>
-                         <BarDisplay>
+                         </NameValueDisplay>
+                         <NameValueDisplay>
                              <Name>"XP"</Name>
                              <Value>[data.character.control.xp]</Value>
-                         </BarDisplay>
-                         <BarDisplay>
+                         </NameValueDisplay>
+                         <NameValueDisplay>
                              <Name>"Kreuzer"</Name>
                              <Value>[data.character.control.coins]</Value>
-                         </BarDisplay>
+                         </NameValueDisplay>
                      </Displays>
                  </Bar>
                  <HorizontalContainer>
@@ -323,22 +323,22 @@
                 <!-- Header Bar -->
                 <Bar>
                      <Displays>
-                         <BarDisplay>
+                         <NameValueDisplay>
                              <Name>"Name"</Name>
                              <Value>[data.character.definition.name]</Value>
-                         </BarDisplay>
-                         <BarDisplay>
+                         </NameValueDisplay>
+                         <NameValueDisplay>
                              <Name>"Rasse"</Name>
                              <Value>[data.character.race.name]</Value>
-                         </BarDisplay>
-                         <BarDisplay>
+                         </NameValueDisplay>
+                         <NameValueDisplay>
                              <Name>"XP"</Name>
                              <Value>[data.character.control.xp]</Value>
-                         </BarDisplay>
-                         <BarDisplay>
+                         </NameValueDisplay>
+                         <NameValueDisplay>
                              <Name>"Kreuzer"</Name>
                              <Value>[data.character.control.coins]</Value>
-                         </BarDisplay>
+                         </NameValueDisplay>
                      </Displays>
                  </Bar>
                 <HorizontalContainer>
@@ -694,22 +694,22 @@
                 <!-- Header Bar -->
                 <Bar>
                      <Displays>
-                         <BarDisplay>
+                         <NameValueDisplay>
                              <Name>"Name"</Name>
                              <Value>[data.character.definition.name]</Value>
-                         </BarDisplay>
-                         <BarDisplay>
+                         </NameValueDisplay>
+                         <NameValueDisplay>
                              <Name>"Rasse"</Name>
                              <Value>[data.character.race.name]</Value>
-                         </BarDisplay>
-                         <BarDisplay>
+                         </NameValueDisplay>
+                         <NameValueDisplay>
                              <Name>"XP"</Name>
                              <Value>[data.character.control.xp]</Value>
-                         </BarDisplay>
-                         <BarDisplay>
+                         </NameValueDisplay>
+                         <NameValueDisplay>
                              <Name>"Kreuzer"</Name>
                              <Value>[data.character.control.coins]</Value>
-                         </BarDisplay>
+                         </NameValueDisplay>
                      </Displays>
                  </Bar>
                 <HorizontalContainer>
@@ -1787,7 +1787,7 @@
                 <!-- Start Nature Talents -->
                 <Header>
                     <Level>2</Level>
-                    <Text>"Naturtalenet"</Text>
+                    <Text>"Naturtalent"</Text>
                 </Header>
                 <GridContainer>
                     <Cols>5</Cols>
@@ -3310,22 +3310,22 @@
                 <!-- Header Bar -->
                 <Bar>
                     <Displays>
-                        <BarDisplay>
+                        <NameValueDisplay>
                             <Name>"Name"</Name>
                             <Value>[data.character.definition.name]</Value>
-                        </BarDisplay>
-                        <BarDisplay>
+                        </NameValueDisplay>
+                        <NameValueDisplay>
                             <Name>"Rasse"</Name>
                             <Value>[data.character.race.name]</Value>
-                        </BarDisplay>
-                        <BarDisplay>
+                        </NameValueDisplay>
+                        <NameValueDisplay>
                             <Name>"XP"</Name>
                             <Value>[data.character.control.xp]</Value>
-                        </BarDisplay>
-                        <BarDisplay>
+                        </NameValueDisplay>
+                        <NameValueDisplay>
                             <Name>"Kreuzer"</Name>
                             <Value>[data.character.control.coins]</Value>
-                        </BarDisplay>
+                        </NameValueDisplay>
                     </Displays>
                 </Bar>
                 <HorizontalContainer>
@@ -3794,22 +3794,22 @@
                 <!-- Header Bar -->
                 <Bar>
                     <Displays>
-                        <BarDisplay>
+                        <NameValueDisplay>
                             <Name>"Name"</Name>
                             <Value>[data.character.definition.name]</Value>
-                        </BarDisplay>
-                        <BarDisplay>
+                        </NameValueDisplay>
+                        <NameValueDisplay>
                             <Name>"Rasse"</Name>
                             <Value>[data.character.race.name]</Value>
-                        </BarDisplay>
-                        <BarDisplay>
+                        </NameValueDisplay>
+                        <NameValueDisplay>
                             <Name>"XP"</Name>
                             <Value>[data.character.control.xp]</Value>
-                        </BarDisplay>
-                        <BarDisplay>
+                        </NameValueDisplay>
+                        <NameValueDisplay>
                             <Name>"Kreuzer"</Name>
                             <Value>[data.character.control.coins]</Value>
-                        </BarDisplay>
+                        </NameValueDisplay>
                     </Displays>
                 </Bar>
                 <HorizontalContainer>
@@ -3896,22 +3896,22 @@
                 <!-- Header Bar -->
                 <Bar>
                     <Displays>
-                        <BarDisplay>
+                        <NameValueDisplay>
                             <Name>"Name"</Name>
                             <Value>[data.character.definition.name]</Value>
-                        </BarDisplay>
-                        <BarDisplay>
+                        </NameValueDisplay>
+                        <NameValueDisplay>
                             <Name>"Rasse"</Name>
                             <Value>[data.character.race.name]</Value>
-                        </BarDisplay>
-                        <BarDisplay>
+                        </NameValueDisplay>
+                        <NameValueDisplay>
                             <Name>"XP"</Name>
                             <Value>[data.character.control.xp]</Value>
-                        </BarDisplay>
-                        <BarDisplay>
+                        </NameValueDisplay>
+                        <NameValueDisplay>
                             <Name>"Kreuzer"</Name>
                             <Value>[data.character.control.coins]</Value>
-                        </BarDisplay>
+                        </NameValueDisplay>
                     </Displays>
                 </Bar>
                 <HorizontalContainer>
@@ -3991,6 +3991,27 @@
                     </Content>
                 </HorizontalContainer>
                 <!-- End Header Bar -->
+                <Header>
+                    <Level>2</Level>
+                    <Text>"Nahkampfwaffen"</Text>
+                </Header>
+                <ListDisplay>
+                    <List>[data.character.items.weapons]</List>
+                    <Columns>
+                        <NameValueDisplay>
+                            <Name>"Name"</Name>
+                            <Value>[name]</Value>
+                        </NameValueDisplay>
+                        <NameValueDisplay>
+                            <Name>"Kosten"</Name>
+                            <Value>[cost]</Value>
+                        </NameValueDisplay>
+                        <NameValueDisplay>
+                            <Name>"Schaden"</Name>
+                            <Value>[damage]</Value>
+                        </NameValueDisplay>
+                    </Columns>
+                </ListDisplay>
             </Content>
         </Page>
     </Pages>