diff --git a/armour/boots/random_boots.trs b/armour/boots/random_boots.trs
new file mode 100644
index 000000000..15d86360e
--- /dev/null
+++ b/armour/boots/random_boots.trs
@@ -0,0 +1,17 @@
+treasureone random_boots
+  arch low_boots
+    magic 1
+    chance 5
+  more
+  arch high_boots
+    magic 3
+    chance 3
+  more
+  arch high_boots_b
+    magic 3
+    chance 1
+  more
+  arch high_boots_w
+    magic 3
+    chance 1
+  end
\ No newline at end of file
diff --git a/armour/helmet/random_helmet.trs b/armour/helmet/random_helmet.trs
new file mode 100644
index 000000000..718955a84
--- /dev/null
+++ b/armour/helmet/random_helmet.trs
@@ -0,0 +1,33 @@
+treasureone random_helmet
+  arch b_full_helmet
+    magic 4
+    chance 5
+  more
+  arch b_helmet
+    magic 4
+    chance 5
+  more
+  arch b_horned_helmet
+    magic 4
+    chance 5
+  more
+  arch coif
+    magic 4
+    chance 5
+  more
+  arch full_helmet
+    magic 2
+    chance 5
+  more
+  arch horned_helmet
+    magic 1
+    chance 5
+  more
+  arch helmet
+    magic 2
+    chance 5
+  more
+  arch bighorned_helmet
+    magic 1
+    chance 5
+  end
\ No newline at end of file
diff --git a/armour/mail/random_mail.trs b/armour/mail/random_mail.trs
new file mode 100644
index 000000000..03536bc55
--- /dev/null
+++ b/armour/mail/random_mail.trs
@@ -0,0 +1,49 @@
+treasureone random_mail
+  arch b_plate_mail
+    magic 4
+    chance 5
+  more
+  arch b_scale_mail
+    magic 4
+    chance 5
+  more
+  arch robe
+    magic 4
+    chance 5
+  more
+  arch leather_armour
+    magic 4
+    chance 5
+  more
+  arch scale_mail
+    magic 4
+    chance 5
+  more
+  arch ring_mail2
+    magic 3
+    chance 5
+  more
+  arch chain_mail
+    magic 3
+    chance 5
+  more
+  arch lapron
+    magic 1
+    chance 1
+  more
+  arch tunic
+    magic 3
+    chance 1
+  more
+  arch ring_mail
+    magic 4
+    chance 5
+  more
+  arch ring_mail
+    magic 4
+    chance 5
+  more
+  arch plate_mail
+    magic 4
+    chance 5
+  end
\ No newline at end of file
diff --git a/armour/shield/random_shield.trs b/armour/shield/random_shield.trs
new file mode 100644
index 000000000..8889038ec
--- /dev/null
+++ b/armour/shield/random_shield.trs
@@ -0,0 +1,33 @@
+treasureone random_shield
+  arch b_shield
+    magic 4
+    chance 5
+  more
+  arch b_small_shield
+    magic 4
+    chance 5
+  more
+  arch spiked_shield
+    magic 1
+    chance 1
+  more
+  arch shield
+    magic 2
+    chance 5
+  more
+  arch small_shield
+    magic 1
+    chance 5
+  more
+  arch high_shield
+    magic 2
+    chance 5
+  more
+  arch kite_shield
+    magic 2
+    chance 5
+  more
+  arch round_shield
+    magic 1
+    chance 5
+  end
\ No newline at end of file
diff --git a/treasures.trs b/treasures.trs
index 978d5715a..bdc0dd34f 100644
--- a/treasures.trs
+++ b/treasures.trs
@@ -200,133 +200,17 @@ treasureone random_armour
   list random_gauntlet
     chance 10
   more
-  arch b_full_helmet
-    magic 4
-    chance 5
+  list random_helmet
+    chance 40
   more
-  arch b_helmet
-    magic 4
-    chance 5
+  list random_mail
+    chance 52
   more
-  arch b_horned_helmet
-    magic 4
-    chance 5
+  list random_shield
+    chance 36
   more
-  arch coif
-    magic 4
-    chance 5
-  more
-  arch b_plate_mail
-    magic 4
-    chance 5
-  more
-  arch b_scale_mail
-    magic 4
-    chance 5
-  more
-  arch b_shield
-    magic 4
-    chance 5
-  more
-  arch b_small_shield
-    magic 4
-    chance 5
-  more
-  arch ring_mail
-    magic 4
-    chance 5
-  more
-  arch ring_mail
-    magic 4
-    chance 5
-  more
-  arch plate_mail
-    magic 4
-    chance 5
-  more
-  arch robe
-    magic 4
-    chance 5
-  more
-  arch leather_armour
-    magic 4
-    chance 5
-  more
-  arch scale_mail
-    magic 4
-    chance 5
-  more
-  arch ring_mail2
-    magic 3
-    chance 5
-  more
-  arch chain_mail
-    magic 3
-    chance 5
-  more
-  arch full_helmet
-    magic 2
-    chance 5
-  more
-  arch spiked_shield
-    magic 1
-    chance 1
-  more
-  arch horned_helmet
-    magic 1
-    chance 5
-  more
-  arch helmet
-    magic 2
-    chance 5
-  more
-  arch bighorned_helmet
-    magic 1
-    chance 5
-  more
-  arch shield
-    magic 2
-    chance 5
-  more
-  arch small_shield
-    magic 1
-    chance 5
-  more
-  arch high_shield
-    magic 2
-    chance 5
-  more
-  arch kite_shield
-    magic 2
-    chance 5
-  more
-  arch round_shield
-    magic 1
-    chance 5
-  more
-  arch low_boots
-    magic 1
-    chance 5
-  more
-  arch high_boots
-    magic 3
-    chance 3
-  more
-  arch high_boots_b
-    magic 3
-    chance 1
-  more
-  arch high_boots_w
-    magic 3
-    chance 1
-  more
-  arch tunic
-    magic 3
-    chance 1
-  more
-  arch lapron
-    magic 1
-    chance 1
+  list random_boots
+    chance 10
   more
   arch cloak
     chance 10