diff --git a/TombLib/TombLib/Catalogs/Engines/TombEngine/Moveables.xml b/TombLib/TombLib/Catalogs/Engines/TombEngine/Moveables.xml
index 6b9d19b43..7aac667bf 100644
--- a/TombLib/TombLib/Catalogs/Engines/TombEngine/Moveables.xml
+++ b/TombLib/TombLib/Catalogs/Engines/TombEngine/Moveables.xml
@@ -379,6 +379,9 @@
 	<moveable id="467" name="CIRCULAR_SAW" />
 	<moveable id="468" name="ROLLING_BARRELS" />
 	<moveable id="469" name="MULTIPLE_BOULDERS" />
+	<moveable id="470" name="FAN" />
+	<moveable id="471" name="LARGE_FAN" />	
+	<moveable id="472" name="FALLING_SPIKES" />	
     <moveable id="500" name="PUZZLE_ITEM1" />
     <moveable id="501" name="PUZZLE_ITEM2" />
     <moveable id="502" name="PUZZLE_ITEM3" />
diff --git a/TombLib/TombLib/Catalogs/TEN Property Catalogs/CIRCULAR_SAW.xml b/TombLib/TombLib/Catalogs/TEN Property Catalogs/CIRCULAR_SAW.xml
new file mode 100644
index 000000000..2ed403b44
--- /dev/null
+++ b/TombLib/TombLib/Catalogs/TEN Property Catalogs/CIRCULAR_SAW.xml	
@@ -0,0 +1,12 @@
+<propertyCatalog>    
+	<moveable id="CIRCULAR_SAW">
+        <property
+          internalName="CircularSawSparkles"
+          displayName="Spark Effect"
+          type="Bool"
+          defaultValue="false"
+          category="Trap parameters"
+          description="Adds a spark effect to the saw"
+        />
+    </moveable>
+</propertyCatalog>
\ No newline at end of file
diff --git a/TombLib/TombLib/Catalogs/TEN Property Catalogs/DISK_SHOOTER.xml b/TombLib/TombLib/Catalogs/TEN Property Catalogs/DISK_SHOOTER.xml
new file mode 100644
index 000000000..621144cf1
--- /dev/null
+++ b/TombLib/TombLib/Catalogs/TEN Property Catalogs/DISK_SHOOTER.xml	
@@ -0,0 +1,28 @@
+<propertyCatalog>    
+	<moveable id="DISK_SHOOTER">
+        <property
+          internalName="DiskShooterPoison"
+          displayName="Poisonous Disks"
+          type="Bool"
+          defaultValue="false"
+          category="Trap parameters"
+          description="Adds poison damage, if checked"
+        />
+        <property
+          internalName="DiskShooterDamage"
+          displayName="Disk Harm Damage"
+          type="Int"
+          defaultValue="45"
+          category="Trap parameters"
+          description="Disk damage"
+        />
+        <property
+          internalName="DiskShooterDelay"
+          displayName="Disk Delay"
+          type="Int"
+          defaultValue="32"
+          category="Trap parameters"
+          description="Delay"
+        />
+    </moveable>
+</propertyCatalog>
\ No newline at end of file
diff --git a/TombLib/TombLib/Catalogs/TEN Property Catalogs/DRILL_BIT.xml b/TombLib/TombLib/Catalogs/TEN Property Catalogs/DRILL_BIT.xml
new file mode 100644
index 000000000..d5e0ea5e2
--- /dev/null
+++ b/TombLib/TombLib/Catalogs/TEN Property Catalogs/DRILL_BIT.xml	
@@ -0,0 +1,12 @@
+<propertyCatalog>    
+	<moveable id="DRILL_BIT">
+        <property
+          internalName="DrillBitSparkles"
+          displayName="Spark Effect"
+          type="Bool"
+          defaultValue="false"
+          category="Trap parameters"
+          description="Adds a spark effect to the Drill Bit"
+        />
+    </moveable>
+</propertyCatalog>
\ No newline at end of file
diff --git a/TombLib/TombLib/Catalogs/TEN Property Catalogs/FALLING_SPIKES.xml b/TombLib/TombLib/Catalogs/TEN Property Catalogs/FALLING_SPIKES.xml
new file mode 100644
index 000000000..dfdddf972
--- /dev/null
+++ b/TombLib/TombLib/Catalogs/TEN Property Catalogs/FALLING_SPIKES.xml	
@@ -0,0 +1,12 @@
+<propertyCatalog>    
+	<moveable id="FALLING_SPIKES">
+        <property
+          internalName="FallingSpikeForwardVelocity"
+          displayName="Forward velocity"
+          type="Bool"
+          defaultValue="false"
+          category="Trap parameters"
+          description="Adds a slight forward movement"
+        />
+    </moveable>
+</propertyCatalog>
\ No newline at end of file
diff --git a/TombLib/TombLib/Catalogs/TEN Property Catalogs/FAN.xml b/TombLib/TombLib/Catalogs/TEN Property Catalogs/FAN.xml
new file mode 100644
index 000000000..968796d21
--- /dev/null
+++ b/TombLib/TombLib/Catalogs/TEN Property Catalogs/FAN.xml	
@@ -0,0 +1,12 @@
+<propertyCatalog>    
+	<moveable id="FAN">
+        <property
+          internalName="FanDamage"
+          displayName="Fan damage"
+          type="Int"
+          defaultValue="1000"
+          category="Trap parameters"
+          description="Fan damage"
+        />
+    </moveable>
+</propertyCatalog>
\ No newline at end of file
diff --git a/TombLib/TombLib/Catalogs/TEN Property Catalogs/FIRE_PENDULUM.xml b/TombLib/TombLib/Catalogs/TEN Property Catalogs/FIRE_PENDULUM.xml
new file mode 100644
index 000000000..658d170f8
--- /dev/null
+++ b/TombLib/TombLib/Catalogs/TEN Property Catalogs/FIRE_PENDULUM.xml	
@@ -0,0 +1,28 @@
+<propertyCatalog>    
+	<moveable id="DISK_SHOOTER">
+        <property
+          internalName="FirePendulumFlameMesh"
+          displayName="Flame Mesh"
+          type="Int"
+          defaultValue="4"
+          category="Trap parameters"
+          description="Mesh to display the flame effect"
+        />
+		<property 
+		  internalName="FirePendulumFlameColor"
+          displayName="Flame Color"
+          type="Color"
+          defaultValue="TEN.Color(0, 0, 0)"
+          category="Appearance"
+          description="Color tint applied to the flame effect. (0, 0, 0) = real flame color" 
+		/>
+		<property
+          internalName="FirePendulumFxFogEffect"
+          displayName="Fx Fog Effect"
+          type="Bool"
+          defaultValue="false"
+          category="Trap parameters"
+          description="Adds a light FX fog effect to the Pendulum"
+        />
+    </moveable>
+</propertyCatalog>
\ No newline at end of file
diff --git a/TombLib/TombLib/Catalogs/TEN Property Catalogs/LARGE_FAN.xml b/TombLib/TombLib/Catalogs/TEN Property Catalogs/LARGE_FAN.xml
new file mode 100644
index 000000000..47ff71beb
--- /dev/null
+++ b/TombLib/TombLib/Catalogs/TEN Property Catalogs/LARGE_FAN.xml	
@@ -0,0 +1,12 @@
+<propertyCatalog>    
+	<moveable id="LARGE_FAN">
+        <property
+          internalName="FanDamage"
+          displayName="Fan damage"
+          type="Int"
+          defaultValue="1000"
+          category="Trap parameters"
+          description="Fan damage"
+        />
+    </moveable>
+</propertyCatalog>
\ No newline at end of file
diff --git a/TombLib/TombLib/Catalogs/TEN Property Catalogs/SWINGING_BOX.xml b/TombLib/TombLib/Catalogs/TEN Property Catalogs/SWINGING_BOX.xml
new file mode 100644
index 000000000..7316c09f8
--- /dev/null
+++ b/TombLib/TombLib/Catalogs/TEN Property Catalogs/SWINGING_BOX.xml	
@@ -0,0 +1,12 @@
+<propertyCatalog>    
+	<moveable id="SWINGING_BOX">
+        <property
+          internalName="PendulumDamage"
+          displayName="Harm damage"
+          type="Int"
+          defaultValue="75"
+          category="Trap parameters"
+          description="Harm damage"
+        />
+    </moveable>
+</propertyCatalog>
\ No newline at end of file
diff --git a/TombLib/TombLib/Catalogs/TEN Property Catalogs/SWINGING_IRON_ANCHOR.xml b/TombLib/TombLib/Catalogs/TEN Property Catalogs/SWINGING_IRON_ANCHOR.xml
new file mode 100644
index 000000000..cfebf166a
--- /dev/null
+++ b/TombLib/TombLib/Catalogs/TEN Property Catalogs/SWINGING_IRON_ANCHOR.xml	
@@ -0,0 +1,12 @@
+<propertyCatalog>    
+	<moveable id="SWINGING_IRON_ANCHOR">
+        <property
+          internalName="PendulumDamage"
+          displayName="Harm damage"
+          type="Int"
+          defaultValue="75"
+          category="Trap parameters"
+          description="Harm damage"
+        />
+    </moveable>
+</propertyCatalog>
\ No newline at end of file
diff --git a/TombLib/TombLib/Catalogs/TEN Property Catalogs/SWINGING_SPIKE_BAG.xml b/TombLib/TombLib/Catalogs/TEN Property Catalogs/SWINGING_SPIKE_BAG.xml
new file mode 100644
index 000000000..b6bc7c20e
--- /dev/null
+++ b/TombLib/TombLib/Catalogs/TEN Property Catalogs/SWINGING_SPIKE_BAG.xml	
@@ -0,0 +1,12 @@
+<propertyCatalog>    
+	<moveable id="SWINGING_SPIKE_BAG">
+        <property
+          internalName="PendulumDamage"
+          displayName="Harm damage"
+          type="Int"
+          defaultValue="75"
+          category="Trap parameters"
+          description="Harm damage"
+        />
+    </moveable>
+</propertyCatalog>
\ No newline at end of file