diff --git a/crafting/Tools/random_tool.trs b/crafting/Tools/random_tool.trs
new file mode 100644
index 000000000..3af18f3f0
--- /dev/null
+++ b/crafting/Tools/random_tool.trs
@@ -0,0 +1,26 @@
+treasureone random_tool
+  arch slicingknife
+    chance 7
+  more
+  arch file
+    chance 5
+  more
+  arch lockpicks
+    chance 2
+  more
+  arch mining_pick
+    chance 5
+  arch torch_unlit
+    nrof 8
+    chance 3
+  more
+  arch torch_unlit
+    nrof 3
+    chance 7
+  more
+  arch flint_and_steel
+    chance 5
+  more
+  list containers
+    chance 10
+  end
\ No newline at end of file
diff --git a/treasures.trs b/treasures.trs
index efeffae66..c07dcab54 100644
--- a/treasures.trs
+++ b/treasures.trs
@@ -85,10 +85,7 @@ treasureone random_knowledge
   arch scroll_literacy
     chance 8
   more
-# not knowledge per se, but is a random skill
-  arch lockpicks
-    chance 8
-  more
+# lockpicking can not be learned
 # meditation can not be learned
   arch scroll_missile_weap
     chance 15
@@ -178,16 +175,19 @@ treasureone needle_diseases
   end
 treasureone random_shop
   list random_weapon
-    chance 15
+    chance 10
   more
   list random_armour
-    chance 15
+    chance 10
   more
   list random_food
-    chance 15
+    chance 10
   more
   list random_special
     chance 5
+  more
+  list random_tool
+    chance 5
   end
 treasureone random_weapon
   list missile_weapons
@@ -244,17 +244,6 @@ treasureone random_special
   arch scroll_new
     chance 10
   more
-  arch torch_unlit
-    nrof 8
-    chance 3
-  more
-  arch torch_unlit
-    nrof 3
-    chance 7
-  more
-  arch flint_and_steel
-    chance 5
-  more
   arch amulet
     chance 10
   more
@@ -1556,18 +1545,9 @@ treasureone uncommon_items
   arch rod_heavy
     chance 10
   more
-  arch lockpicks
-    chance 5
-  more
-  arch file
-    chance 3
-  more
   arch ring_spell
     chance 1
   more
-  arch slicingknife
-    chance 2
-  more
   list NONE
     chance 23
   end