diff --git a/Equipment/Weapons/Advanced/index.md b/Equipment/Weapons/Advanced/index.md
index 467936d24..e4d455cd5 100644
--- a/Equipment/Weapons/Advanced/index.md
+++ b/Equipment/Weapons/Advanced/index.md
@@ -2,7 +2,7 @@
title: Advanced Weapons
parent: Weapons
grand_parent: Equipment
-nav_order: 6
+nav_order: 16
---
# Advanced Weapons
diff --git a/Equipment/Weapons/Axes/index.md b/Equipment/Weapons/Axes/index.md
new file mode 100644
index 000000000..7b2fb0087
--- /dev/null
+++ b/Equipment/Weapons/Axes/index.md
@@ -0,0 +1,18 @@
+---
+title: Axes
+parent: Weapons
+grand_parent: Equipment
+---
+
+# Axes
+Damage types are represented by icons: 
for bludgeoning, 
for piercing and 
for slashing damage.
+
+| Name | Cost | Damage | Weight | Str/Dex | Properties |
+|:-----|-----:|:-------|-------:|:-------:|:-----------|
+| Boarding Axe | 6 gp | 1d6 / | 1 lb. | 7 | Brutal 1, disarm, finesse, hooked, light
+| Dwarven Maulaxe | 25 gp | 1d6 / | 1 lb. | 7 | Brutal 1, disarm, exotic, finesse, hooked, light, sunder 1, thrown (20/60) |
+| Battleaxe | 10 gp | 1d8 | 2 lb. | 11 | Brutal 1, disarm, hooked, versatile |
+| Longaxe | 10 gp | 1d10 | 2 lb. | 11 | Brutal 1, disarm, hooked, trip, two-handed |
+| Greataxe | 30 gp | 1d12 | 3 lb. | 13 | Brutal 1, cleave, two-handed, unwieldy |
+| Orc Double Axe | 50 gp | 1d8 | 5 lb. | 15 | Brutal 1, cleave, double, exotic, hooked, two-handed, unwieldy |
+| Dwarven Urgrosh | 60 gp | 1d8 / | 5 lb. | 15 | Brace, brutal 1, disarm, double, exotic, hooked, two-handed, unwieldy |
diff --git a/Equipment/Weapons/Blades/index.md b/Equipment/Weapons/Blades/index.md
new file mode 100644
index 000000000..f1a91b94b
--- /dev/null
+++ b/Equipment/Weapons/Blades/index.md
@@ -0,0 +1,26 @@
+---
+title: Blades
+parent: Weapons
+grand_parent: Equipment
+---
+
+# Blades
+Damage types are represented by icons: for bludgeoning, for piercing and for slashing damage.
+
+| Name | Cost | Damage | Weight | Str/Dex | Properties |
+|:-----|-----:|:-------|-------:|:-------:|:-----------|
+| Swordbreaker | 12 gp | 1d4 / | 1 lb. | 5 | Close, disarm, finesse, light, parry |
+| Scimitar | 15 gp| 1d6 | 2 lb. | 7 | Finesse, light, mounted, parry |
+| Shortsword | 10 gp | 2d3 / | 2 lb. | 7 | Finesse, light, parry |
+| Falchion | 15 gp | 1d8 | 2 lb. | 9 | Critical, parry |
+| Cavalry Sabre | 15 gp | 1d8 | 3 lb. | 9 | Mounted, parry |
+| Rapier | 20 gp | 1d8 | 2 lb. | 9 | Critical, finesse, parry |
+| Sidesword | 15 gp | 2d4 / | 2 lb. | 9 | Finesse, parry |
+| Broadsword | 20 gp | 2d4 / | 3 lb. | 11 | Finesse, opportunistic, parry |
+| Estoc | 50 gp | 1d8 | 3 lb. | 11 | Critical, finesse, parry, sunder 1, versatile |
+| Katana | 50 gp | 1d8 / | 3 lb. | 11 | Critical, finesse, parry, versatile |
+| Bastard Sword | 15 gp | 2d4 / | 3 lb. | 11 | Parry, versatile |
+| Elven Curveblade | 80 gp | 1d10 / | 3 lb. | 11 | Critical, exotic, finesse, mounted strike, parry, two-handed |
+| Longsword | 15 gp | 2d5 / | 3 lb. | 11 | Opportunistic, parry, two-handed |
+| Greatsword | 50 gp | 3d4 / | 6 lb. | 13 | Bashing (1d4 ), long, parry, two-handed, unwieldy |
+| Double-Bladed Sword | 50 gp | 2d4 / | 4 lb. | 15 | Double, parry, two-handed, unwieldy |
diff --git a/Equipment/Weapons/Bows/index.md b/Equipment/Weapons/Bows/index.md
new file mode 100644
index 000000000..ce469aefa
--- /dev/null
+++ b/Equipment/Weapons/Bows/index.md
@@ -0,0 +1,21 @@
+---
+title: Bows
+parent: Weapons
+grand_parent: Equipment
+---
+
+# Bows
+Damage types are represented by icons: for bludgeoning, for piercing and for slashing damage.
+
+The 'longbows' presented here are consistent with the tabletop RPG concept of a longbow and represent 3 to 4-foot bows. A full sized, 6-foot english longbow is best treated as a greatbow.
+
+| Name | Cost | Damage | Weight | Range | Properties |
+|:-----|-----:|:-------|-------:|:-----:|:-----------|
+| Self Shortbow | 30 gp | 1d6 | 2 lb. | 90/360 | Ammunition, brutal 1, strength 7, two-handed |
+| Composite Shortbow | 75 gp | 1d8 | 2 lb. | 150/600 | Ammunition, brutal 1, strength 9, two-handed |
+| Recurve Composite Shortbow | 150 gp | 1d10 | 3 lb. | 300/1200 | Ammunition, brutal 1, strength 11, two-handed |
+| Self Longbow | 50 gp | 1d8 | 2 lb. | 150/600 | Ammunition, brutal 1, strength 9, tall, two-handed, unwieldy |
+| Composite Longbow | 100 gp | 1d10 | 3 lb. | 300/1200 | Ammunition, brutal 1, strength 11, tall, two-handed, unwieldy |
+| Recurve Composite Longbow | 200 gp | 1d12 | 3 lb. | 500/2000 | Ammunition, brutal 1, strength 13, tall, two-handed, unwieldy |
+| Greatbow | 150 gp | 1d12 | 3 lb.| 500/2000 | Ammunition, brutal 1, strength 13, tall, two-handed, unwieldy, volley |
+| Orc Hornbow | 130 gp | 2d6 | 3 lb. | 80/320 | Ammunition, brutal 1, strength 15, two-handed |
diff --git a/Equipment/Weapons/Crossbows/index.md b/Equipment/Weapons/Crossbows/index.md
new file mode 100644
index 000000000..c1fbb62d3
--- /dev/null
+++ b/Equipment/Weapons/Crossbows/index.md
@@ -0,0 +1,21 @@
+---
+title: Crossbows
+parent: Weapons
+grand_parent: Equipment
+---
+
+# Crossbows
+Damage types are represented by icons: for bludgeoning, for piercing and for slashing damage.
+
+| Name | Cost | Damage | Weight | Range | Properties |
+|:-----|-----:|:-------|-------:|:-----:|:-----------|
+| Blade Crossbow | 35 gp | 2d2 / | 4 lb. | 40/160 | Ammunition, caliber 2, load 1, stock, two-handed |
+| Pellet Crossbow | 20 gp | 1d6 / | 4 lb. | 40/160 | Ammunition, load, pellets, stock, two-handed |
+| Hand Crossbow | 75 gp | 1d6 | 2 lb. | 30/120 | Ammunition, light, load, point-blank |
+| Repeating Hand Crossbow | 600 gp | 1d6 | 3 lb. | 30/120 | Ammunition 5, light, load 2, point-blank |
+| Light Crossbow | 25 gp | 1d8 | 4 lb. | 80/320 | Ammunition, load 1, stock, two-handed |
+| Light Double Crossbow | 50 gp | 1d8 | 6 lb. | 80/320 | Ammunition 2, load 2, stock, two-handed |
+| Light Repeating Crossbow | 250 gp| 1d8 | 6 lb. | 80/320 | Ammunition 5, load 2, two-handed |
+| Heavy Crossbow | 50 gp | 1d10 | 8 lb. | 100/400 | Ammunition, load 2, stock, two-handed, unwieldy |
+| Heavy Double Crossbow | 100 gp | 1d10 | 12 lb. | 100/400 | Ammunition 2, load 4, stock, two-handed, unwieldy |
+| Heavy Repeating Crossbow | 400 gp | 1d10 | 12 lb. | 100/400 | Ammunition 5, load 2, two-handed, unwieldy |
diff --git a/Equipment/Weapons/Firearms/index.md b/Equipment/Weapons/Firearms/index.md
new file mode 100644
index 000000000..cf093dac8
--- /dev/null
+++ b/Equipment/Weapons/Firearms/index.md
@@ -0,0 +1,55 @@
+---
+title: Firearms
+parent: Weapons
+grand_parent: Equipment
+---
+
+# Firearms
+Damage types are represented by icons: for bludgeoning, for piercing and for slashing damage.
+
+## Medieval Firearms
+
+| Name | Cost | Damage | Weight | Range | Properties |
+|:-----|-----:|-------:|-------:|:-----:|:-----------|
+| Handgonne | 240 gp | 2d12 | 7 lb. | 150/600 | Ammunition, load 4, misfire 2, sunder 3, two-handed |
+| Two-Faced Gonne | 370 gp | 2d12 | 11 lb. | 150/600 | Ammunition 2, load 8, misfire 2, sunder 3, two-handed, unwieldy |
+| Ten-Eyed Gonne | 920 gp | 2d12 | 27 lb. | 15/45 | Ammunition 2, shot 5, load 40, misfire 2, sunder 3, two-handed, unwieldy |
+
+## Renaissance Firearms
+
+| Name | Cost | Damage | Weight | Range | Properties |
+|:-----|-----:|-------:|-------:|:-----:|:-----------|
+| Wheellock Pistol | 400 gp | 1d10 | 3 lb. | 200/800 | Ammunition, light, load 3, misfire 1, point-blank, velocity |
+| Pocket Pistol | 380 gp | 1d8 | ½ lb. | 80/320 | Ammunition, concealed, light, load 3, misfire 1, point-blank, velocity |
+| Flintlock Pistol | 400 gp | 2d10 | 3 lb. | 200/800 | Ammunition, light, load 2, misfire 1, point-blank, velocity |
+| Duck's Foot Pistol | 550 gp | 1d8 | 2 lb. | 30/90 | Ammunition, shot 4, light, load 12, misfire 1, point-blank, velocity |
+| Snaphaunce Pistol | 250 gp | 1d8 | 1 lb. | 125/500 | Ammunition, light, load 3, misfire 1, point-blank, velocity |
+| Tantsutsu | 350 gp | 1d12 | 5 lb. | 125/500 | Ammunition, light, load 7, misfire 1, point-blank, velocity |
+| Arquebus | 300 gp | 2d10 | 10 lb. | 200/800 | Ammunition, load 9, misire 1, stock, two-handed, velocity |
+| Caliver | 270 gp | 2d10 | 7 lb. | 250/1000 | Ammunition, caliber 1, load 9, misfire 1, stock, two-handed, velocity |
+| Carbine | 580 gp | 2d12 | 7 lb. | 250/1000 | Ammunition, caliber 1, load 6, misfire 1, stock, two-handed, velocity |
+| Flintlock Carbine | 490 gp | 2d12 | 4 lb. | 200/800 | Ammunition, load 6, misfire 1, stock, two-handed, velocity |
+| Fusil Ordinaire | 300 gp | 2d12 | 7 lb. | 200/800 | Ammunition, caliber 1, load 6, misfire 1, stock, two-handed, velocity |
+| Matchlock Musket | 350 gp | 2d12 | 21 lb. | 300/1000 | Ammunition, caliber 2, load 9, misfire 1, stock, two-handed, velocity |
+| Flintlock Musket | 400 gp | 2d12 | 13 lb. | 300/1000 | Ammunition, caliber 2, load 3, misfire 1, stock, two-handed, velocity |
+| Puckle Gun | 3600 gp | 2d12 | 90 lb. | 150/600 | Ammunition 9, load 14, misfire 1, tripod, two-handed, velocity |
+| Teppo | 340 gp | 1d10 | 9 lb. | 150/600 | Ammunition, load 9, misfire 1, stock, two-handed, velocity |
+| Wall Gun | 850 gp | 2d12 | 28 lb. | 300/1000 | Ammunition, caliber 3, load 6, misfire 1, tripod, two-handed, velocity |
+| Winged Tiger Gun | 440 gp | 2d10 | 7 lb. | 150/600 | Ammunition 3, load 27, misfire 1, stock, two-handed, velocity |
+| Breechloading Carbine | 540 gp | 2d10 | 9 lb. | 150/1500 | Ammunition, load 1, misfire 1, stock, two-handed, velocity |
+| Jäger Rifle | 600 gp | 2d10 | 11 lb. | 200/2000 | Ammunition, caliber 1, load 9, misfire 1, stock, two-handed, velocity |
+| Double Jäger Rifle | 1000 gp | 2d10 | 20 lb. | 200/2000 | Ammunition 2, caliber 1, load 18, misfire 1, stock, two-handed, velocity |
+| Blunderbuss | 330 gp | 2d8 | 11 lb. | 30/90 | Ammunition, shot 3, load 2, misfire 1, stock, two-handed, velocity |
+| Single Fowling Piece | 270 gp | 1d6 | 10 lb. | 30/90 | Ammunition, shot 5, load 6, misfire 1, stock, two-handed, velocity |
+| Double Fowling Piece | 340 gp | 1d6 | 17 lb. | 30/90 | Ammunition 2, shot 5, load 12, misfire 1, stock, two-handed, velocity |
+
+## Industrial Firearms
+
+| Name | Cost | Damage | Weight | Range | Properties |
+|:-----|-----:|-------:|-------:|:-----:|:-----------|
+| Derringer | 400 gp | 1d10 | ½ lb. | 200/2000 | Ammunition 2, concealed, load 1, light, point-blank, velocity |
+| Revolver | 600 gp | 2d8 | 2½ lb. | 400/4000 | Ammunition 6, load 2, light, point-blank, velocity |
+| Rifle-Musket | 600 gp | 2d10 | 9 lb. | 2000/6000 | Ammunition, caliber 2, load 2, stock, two-handed, velocity |
+| Cartridge Rifle | 800 gp | 2d10 | 6 lb. | 2000/6000 | Ammunition, caliber 3, load, stock, two-handed, velocity |
+| Lever-Action Carbine | 2400 gp | 2d8 | 7 lb. | 1500/9000 | Ammunition 7, caliber 3, load 3, stock, two-handed, velocity |
+| Double Barrelled Shotgun | 1800 gp | 2d8 | 10 lb. | 30/90 | Ammunition 2, shot 5, load 1, stock, two-handed, unwieldy, velocity |
diff --git a/Equipment/Weapons/Glossary/index.md b/Equipment/Weapons/Glossary/index.md
index 41ee13e07..32bd8e944 100644
--- a/Equipment/Weapons/Glossary/index.md
+++ b/Equipment/Weapons/Glossary/index.md
@@ -2,7 +2,7 @@
title: Weapon Table Glossary
parent: Weapons
grand_parent: Equipment
-nav_order: 4
+nav_order: 14
---
# Weapon Table Glossary
diff --git a/Equipment/Weapons/Melee/index.md b/Equipment/Weapons/Melee/index.md
index fd04b5530..37cfb25b3 100644
--- a/Equipment/Weapons/Melee/index.md
+++ b/Equipment/Weapons/Melee/index.md
@@ -2,7 +2,6 @@
title: Melee Weapon Tables
parent: Weapons
grand_parent: Equipment
-nav_order: 2
---
# Melee Weapon Tables
diff --git a/Equipment/Weapons/Ranged/index.md b/Equipment/Weapons/Ranged/index.md
index d913fb686..780c98715 100644
--- a/Equipment/Weapons/Ranged/index.md
+++ b/Equipment/Weapons/Ranged/index.md
@@ -2,7 +2,6 @@
title: Ranged Weapon Tables
parent: Weapons
grand_parent: Equipment
-nav_order: 3
---
# Ranged Weapon Tables
diff --git a/Equipment/Weapons/Siege/index.md b/Equipment/Weapons/Siege/index.md
index 2c6108bd9..7d5e9ccae 100644
--- a/Equipment/Weapons/Siege/index.md
+++ b/Equipment/Weapons/Siege/index.md
@@ -2,7 +2,7 @@
title: Siege Weapons
parent: Weapons
grand_parent: Equipment
-nav_order: 7
+nav_order: 17
---
# Siege Weapons
diff --git a/Equipment/Weapons/Simple/index.md b/Equipment/Weapons/Simple/index.md
new file mode 100644
index 000000000..de96a8ca5
--- /dev/null
+++ b/Equipment/Weapons/Simple/index.md
@@ -0,0 +1,47 @@
+---
+title: Simple Weapons
+parent: Weapons
+grand_parent: Equipment
+nav_order: 2
+---
+
+# Simple Weapons
+Damage types are represented by icons: for bludgeoning, for piercing and for slashing damage.
+
+| Name | Cost | Damage | Weight | Str/Dex | Properties |
+|:-----|-----:|:-------|-------:|:-------:|:-----------|
+| Hatchet | 3 gp | 1d4 / | 1 lb. | 5 | Concealed, finesse, light, thrown (30/90) |
+| Handaxe | 5 gp | 1d6 | 1 lb. | 7 | Finesse, light, thrown (20/60) |
+| Archer's Axe | 7 gp | 1d8 | 2 lb. | 9 | — |
+| Stiletto | 5 gp | 1d4 | ½ lb. | 5 | Brutal 1, close, concealed, finesse, light |
+| Dagger | 2 gp | 2d2 / | ½ lb. | 5 | Close, concealed, finesse, light, thrown (20/60) |
+| Sickle | 1 gp | 1d6 | 2 lb. | 7 | Finesse, hooked, light |
+| Smallsword | 10 gp | 1d6 | 1 lb. | 7 | Finesse, light |
+| Arming Sword | 10 gp | 2d4 / | 2 lb. | 9 | — |
+| Light Hammer | 2 gp | 1d4 | 1 lb. | 5 | Finesse, light, thrown (20/60) |
+| Light Mace | 5 gp | 1d6 | 2 lb. | 7 | Finesse, light |
+| Club | 1 sp | 1d6 | 3 lb. | 7 | Non-lethal |
+| Heavy Mace | 12 gp | 1d8 | 4 lb. | 9 | — |
+| Greatclub | 2 sp | 1d10 | 8 lb. | 11 | Non-lethal, two-handed, unwieldy |
+| Lasso | 1 sp | — | 5 lb. | 9 | Break, finesse, restraining (body/legs), tangle, thrown (20/60) |
+| Whip | 1 gp | 1 | 2 lb. | 9 | Disarm, finesse, non-lethal, reach, restraining (hand), tangle, trip |
+| Scourge | 1 gp | 1d4 | 1 lb. | 7 | Finesse, non-lethal, tangle |
+| Garotte | 3 gp | 1d6 | 1 lb. | 9 | Finesse, light, suffocating, two-handed |
+| Peasant Flail | 8 gp | 1d8 | 5 lb. | 9 | Two-handed |
+| Quarterstaff | 2 sp | 1d6 | 4 lb. | 7 | Double, finesse, non-lethal |
+| Crook | 1 gp | 1d6 | 5 lb. | 7 | Finesse, non-lethal, reach, trip, two-handed |
+| Javelin | 5 sp | 1d6 | 2 lb. | 7 | Sharp 1, thrown (30/120) |
+| Spear | 1 gp | 2d3 | 3 lb. | 9 | Brace, brutal 1, finesse, mounted, sharp 1, thrown (20/60), versatile |
+| Boar Spear | 5 gp | 2d3 | 4 lb. | 9 | Brace, preventing, sharp (1), versatile |
+| Plançon | 1 gp | 1d8 / | 4 lb. | 9 | Brace, sharp 1, versatile |
+| Scythe | 18 gp | 1d8 | 4 lb. | 9 | Brutal 2, trip, two-handed, unwieldy |
+| War Scythe | 25 gp | 1d8 | 10 lb. | 11 | Brutal 2, long, two-handed, unwieldy |
+| Longspear | 5 gp | 2d4 | 4 lb. | 9 | Brace, brutal 1, long, mounted, sharp 1, shield, two-handed, unwieldy |
+| Glove, armoured | 2 gp | +1 | 1 lb. | — | Close, finesse, light, non-lethal, worn |
+| Hook, prosthetic | 10 gp | 1d4 | 1 lb. | — | Close, disarm, finesse, hooked, light, worn |
+| Knuckles, brass | 1 gp | +1 | 1 lb. | — | Close, concealed, finesse, light, non-lethal, worn |
+| Blowgun | 10 gp | 1 | 1 lb. | 25/100 | Ammunition, load, non-lethal |
+| Dart | 5 cp | 1d4 | ¼ lb. | 20/60 | Light, non-lethal, thrown |
+| Sling | 1 sp | 1d4 / | — | 30/120 | Non-lethal, pellets |
+| Pellet Bow | 15 gp | 1d4 / | 2 lb. | 40/160 | Non-lethal, pellets, two-handed |
+| Hunting Bow | 25 gp | 1d6 | 2 lb.| 80/320 | Ammunition, two-handed |
diff --git a/Equipment/Weapons/Wielding/index.md b/Equipment/Weapons/Wielding/index.md
index a2a809253..3f2cb02ae 100644
--- a/Equipment/Weapons/Wielding/index.md
+++ b/Equipment/Weapons/Wielding/index.md
@@ -2,7 +2,7 @@
title: Wielding Weapons
parent: Weapons
grand_parent: Equipment
-nav_order: 5
+nav_order: 15
---
# Wielding Weapons
diff --git a/Origins/Cultures/Villager/index.md b/Origins/Cultures/Villager/index.md
index c59121454..72e1b75e2 100644
--- a/Origins/Cultures/Villager/index.md
+++ b/Origins/Cultures/Villager/index.md
@@ -29,4 +29,4 @@ Life along the crossroads rarely offers an opportunity for proper schooling, but
You have +1d to Perception while keeping watch during a rest.
## Languages
-You can speak, read and write your local language. For example, a village from the kingdom of Breanne speaks Breannian.
+You can speak, read and write your local language. For example, a villager from the kingdom of Breanne speaks Breannian.