diff --git a/Installer/Changes.txt b/Installer/Changes.txt
index 26132f959..a04fb7c7c 100644
--- a/Installer/Changes.txt
+++ b/Installer/Changes.txt
@@ -19,6 +19,9 @@ WadTool:
 TEN nodes:
  * Added a node to unswap a previously swapped mesh.
  
+ TEN property system updates:
+ * Added properties for customising PUNA_BOSS lightning colours, hardcoded sounds, attack damage and behavior. 
+ 
 Version 1.11
 ============
 
diff --git a/TombLib/TombLib/Catalogs/TEN Property Catalogs/TR3/ID_PUNA_BOSS.xml b/TombLib/TombLib/Catalogs/TEN Property Catalogs/TR3/ID_PUNA_BOSS.xml
new file mode 100644
index 000000000..ec9161eb3
--- /dev/null
+++ b/TombLib/TombLib/Catalogs/TEN Property Catalogs/TR3/ID_PUNA_BOSS.xml	
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8"?>
+<propertyCatalog>
+  <moveable id="PUNA_BOSS">
+    <property
+      internalName="PunaLightningDamage"
+      displayName="Lightning Attack Damage"
+      type="Int"
+      defaultValue="350"
+      category="Attack Parameters"
+      description="Damage dealt by Puna's direct lightning strike."
+    />
+    <property
+      internalName="PunaAttackCount"
+      displayName="Attacks Before Lizard Summon"
+      type="Int"
+      defaultValue="4"
+      category="Attack Parameters"
+      description="Number of lightning attacks Puna performs before summoning a lizard. Requires lizards to be present on the map."
+    />
+    <property
+      internalName="PunaAlertRange"
+      displayName="Alert Range (blocks)"
+      type="Float"
+      defaultValue="2.5"
+      category="Behaviour"
+      description="Distance in blocks at which Puna becomes alerted and begins attacking the player."
+    />
+    <property
+      internalName="PunaTurnRate"
+      displayName="Turn Rate (degrees)"
+      type="Float"
+      defaultValue="3.0"
+      category="Behaviour"
+      description="Maximum rotation speed of Puna's body per frame, in degrees."
+    />
+    <property
+      internalName="PunaLightningColor"
+      displayName="Lightning Color"
+      type="Color"
+      defaultValue="TEN.Color(20, 160, 160)"
+      category="Visuals"
+      description="Color of the direct lightning attack fired at the player."
+    />
+    <property
+      internalName="PunaSummonColor"
+      displayName="Summon Lightning Color"
+      type="Color"
+      defaultValue="TEN.Color(0, 255, 128)"
+      category="Visuals"
+      description="Color of the lightning bolt fired to summon a lizard."
+    />
+    <property
+      internalName="PunaShieldColor"
+      displayName="Shield Color"
+      type="Color"
+      defaultValue="TEN.Color(0, 64, 64, 166)"
+      hasAlpha="true"
+      category="Visuals"
+      description="Color of the energy shield that deflects shots while Puna is not attacking."
+    />
+    <property
+      internalName="PunaEffectColor"
+      displayName="Death Effect Color"
+      type="Color"
+      defaultValue="TEN.Color(0, 102, 128, 128)"
+      hasAlpha="true"
+      category="Visuals"
+      description="Color of the shockwave and dynamic light emitted during Puna's death explosion sequence."
+    />
+    <property
+      internalName="PunaExplosionColor1"
+      displayName="Explosion Spark Color 1"
+      type="Color"
+      defaultValue="TEN.Color(0, 179, 77, 128)"
+      hasAlpha="true"
+      category="Visuals"
+      description="Primary color of the explosion sparks during Puna's death sequence."
+    />
+    <property
+      internalName="PunaExplosionColor2"
+      displayName="Explosion Spark Color 2"
+      type="Color"
+      defaultValue="TEN.Color(26, 77, 179, 128)"
+      hasAlpha="true"
+      category="Visuals"
+      description="Secondary color of the explosion sparks during Puna's death sequence."
+    />
+	<property
+	  internalName="PunaHitSound"
+	  displayName="Hit sound"
+	  type="Int"
+	  defaultValue="695"
+	  category="Sounds"
+	  description="Sound played when Puna is hit."
+	/>
+	<property
+	  internalName="PunaDeathSound"
+	  displayName="Death sound"
+	  type="Int"
+	  defaultValue="693"
+	  category="Sounds"
+	  description="Sound played when Puna is dying."
+	/>
+	<property
+	  internalName="PunaChairTurnSound"
+	  displayName="Chair turning sound"
+	  type="Int"
+	  defaultValue="696"
+	  category="Sounds"
+	  description="Sound played when Puna's chair is turning."
+	/>
+	<property
+	  internalName="PunaChairTurnEndSound"
+	  displayName="Chair turning end sound"
+	  type="Int"
+	  defaultValue="692"
+	  category="Sounds"
+	  description="Sound played when Puna's chair has finished turning."
+	/>		
+  </moveable>
+</propertyCatalog>
diff --git a/TombLib/TombLib/TombLib.csproj b/TombLib/TombLib/TombLib.csproj
index afdb8c8ba..cd6dde1d7 100644
--- a/TombLib/TombLib/TombLib.csproj
+++ b/TombLib/TombLib/TombLib.csproj
@@ -426,6 +426,12 @@
     <None Update="Catalogs\Engines\TR5\States.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Update="Catalogs\TEN Property Catalogs\TR3\ID_PUNA.xml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Update="Catalogs\TEN Property Catalogs\TR3\ID_PUNA_BOSS.xml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Content Include="Catalogs\Engines\TRNG\CLICK_DISTANCE_32.txt">