diff --git a/src/main/resources/rs117/hd/scene/areas.json b/src/main/resources/rs117/hd/scene/areas.json
index ab0b40f433..007dbe4dbe 100644
--- a/src/main/resources/rs117/hd/scene/areas.json
+++ b/src/main/resources/rs117/hd/scene/areas.json
@@ -8715,6 +8715,19 @@
       [ 2960, 5780, 2942, 5768 ]
     ]
   },
+  {
+    "name": "CAMDOZAAL_HOUSE_LIGHTS_HIGH",
+    "aabbs": [
+      [ 2950, 5800, 2966, 5805 ],
+      [ 2985, 5787, 2990, 5791 ]
+    ]
+  },
+  {
+    "name": "CAMDOZAAL_HOUSE_LIGHTS_LOW",
+    "aabbs": [
+      [ 2950, 5800, 2966, 5805 ]
+    ]
+  },
   {
     "name": "CAMDOZAAL",
     "aabbs": [
diff --git a/src/main/resources/rs117/hd/scene/lights.json b/src/main/resources/rs117/hd/scene/lights.json
index 805e7399e6..69bf602c82 100644
--- a/src/main/resources/rs117/hd/scene/lights.json
+++ b/src/main/resources/rs117/hd/scene/lights.json
@@ -26540,10 +26540,88 @@
     ]
   },
   {
-    "description": "CAMDOZAAL_STATUE",
-    "offset": [ 0, 200, -50 ],
-    "radius": 250,
-    "strength": 30,
+    "description": "CAMDOZAAL_SMALL_TORCH_ON_HOUSE_1",
+    "areas": [ "CAMDOZAAL_HOUSE_LIGHTS_LOW" ],
+    "offset": [ 63, 255, -85 ],
+    "radius": 200,
+    "strength": 15,
+    "color": [
+      0,
+      140,
+      255
+    ],
+    "type": "FLICKER",
+    "duration": 0,
+    "range": 7.5,
+    "objectIds": [
+      "BIM_RUINS_WALLKIT_RESIDENTIAL01",
+      "BIM_RUINS_WALLKIT_RESIDENTIAL02"
+    ]
+  },
+  {
+    "description": "CAMDOZAAL_SMALL_TORCH_ON_HOUSE_2",
+    "areas": [ "CAMDOZAAL_HOUSE_LIGHTS_LOW" ],
+    "offset": [ -63, 255, -85 ],
+    "radius": 200,
+    "strength": 15,
+    "color": [
+      0,
+      140,
+      255
+    ],
+    "type": "FLICKER",
+    "duration": 0,
+    "range": 7.5,
+    "objectIds": [
+      "BIM_RUINS_WALLKIT_RESIDENTIAL01",
+      "BIM_RUINS_WALLKIT_RESIDENTIAL02"
+    ]
+  },
+  {
+    "description": "CAMDOZAAL_SMALL_TORCH_ON_HOUSE_3",
+    "areas": [ "CAMDOZAAL_HOUSE_LIGHTS_HIGH" ],
+    "offset": [ -183, 405, -85 ],
+    "radius": 200,
+    "strength": 15,
+    "color": [
+      0,
+      140,
+      255
+    ],
+    "type": "FLICKER",
+    "duration": 0,
+    "range": 7.5,
+    "objectIds": [
+      "BIM_RUINS_WALLKIT_RESIDENTIAL01",
+      "BIM_RUINS_WALLKIT_RESIDENTIAL02",
+      "BIM_RUINS_WALLKIT_WORKSHOP01"
+    ]
+  },
+  {
+    "description": "CAMDOZAAL_SMALL_TORCH_ON_HOUSE_4",
+    "areas": [ "CAMDOZAAL_HOUSE_LIGHTS_HIGH" ],
+    "offset": [ 183, 405, -85 ],
+    "radius": 200,
+    "strength": 15,
+    "color": [
+      0,
+      140,
+      255
+    ],
+    "type": "FLICKER",
+    "duration": 0,
+    "range": 7.5,
+    "objectIds": [
+      "BIM_RUINS_WALLKIT_RESIDENTIAL01",
+      "BIM_RUINS_WALLKIT_RESIDENTIAL02",
+      "BIM_RUINS_WALLKIT_WORKSHOP01"
+    ]
+  },
+  {
+    "description": "CAMDOZAAL_STATUE_SHORT",
+    "offset": [ 0, 245, -50 ],
+    "radius": 300,
+    "strength": 20,
     "color": [
       0,
       140,
@@ -26556,9 +26634,56 @@
       "BIM_RUINS_WALLKIT_STREETLAMP01"
     ]
   },
+  {
+    "description": "CAMDOZAAL_STATUE_WIDE",
+    "offset": [ 0, 280, -80 ],
+    "radius": 570,
+    "strength": 7,
+    "color": [
+      0,
+      140,
+      255
+    ],
+    "type": "FLICKER",
+    "duration": 0,
+    "range": 7.5,
+    "objectIds": [
+      "BIM_RUINS_WALLKIT_STREETLAMP01"
+    ]
+  },
+  {
+    "description": "CAMDOZAAL_BARRIER_OPEN",
+    "offset": [ 0, 150, 0 ],
+    "radius": 300,
+    "strength": 20,
+    "color": [
+      0,
+      150,
+      255
+    ],
+    "type": "STATIC",
+    "objectIds": [
+      "CAMDOZAAL_VAULT_BARRIER_OPEN"
+    ]
+  },
+  {
+    "description": "CAMDOZAAL_BARRIER_CLOSED",
+    "offset": [ 0, 150, 0 ],
+    "radius": 300,
+    "strength": 10,
+    "color": [
+      252,
+      190,
+      0
+    ],
+    "type": "STATIC",
+    "objectIds": [
+      "CAMDOZAAL_VAULT_BARRIER_CLOSED"
+    ]
+  },
   {
     "description": "CAMDOZAAL_CRYSTALS",
-    "height": 30,
+    "height": 75,
     "alignment": "CENTER",
     "radius": 220,
     "strength": 12.5,
@@ -26569,25 +26694,23 @@
     ],
     "type": "PULSE",
     "duration": 1700,
-    "range": 30,
+    "range": 15,
     "objectIds": [
       "DECOKIT_CRYSTAL_BARRONITE01"
     ]
   },
   {
     "description": "BARRONITE_ROCK",
-    "height": 100,
+    "offset": [ 0, 140, 30 ],
     "alignment": "CENTER",
     "radius": 220,
-    "strength": 17.5,
+    "strength": 10,
     "color": [
       150,
       0,
       255
     ],
-    "type": "PULSE",
-    "duration": 2200,
-    "range": 20,
+    "type": "STATIC",
     "objectIds": [
       "CAMDOZAALROCK1",
       "CAMDOZAALROCK2"
@@ -26595,10 +26718,10 @@
   },
   {
     "description": "CAMDOZAAL_SACRED_FORGE",
-    "height": 100,
+    "offset": [ 0, 100, -120 ],
     "alignment": "CENTER",
-    "radius": 1400,
-    "strength": 12.5,
+    "radius": 800,
+    "strength": 14,
     "color": [
       252,
       148,
@@ -26606,54 +26729,52 @@
     ],
     "type": "FLICKER",
     "duration": 0,
-    "range": 30,
+    "range": 15,
     "objectIds": [
       "BIM_RUINS_WALLKIT_SACRED_FORGE_OP",
       "BIM_RUINS_WALLKIT_SACRED_FORGE"
     ]
   },
   {
-    "description": "CAMDOZAAL_VAULT_ORANGE_LIGHT",
-    "height": 30,
-    "alignment": "CENTER",
-    "radius": 200,
-    "strength": 12.5,
+    "description": "CAMDOZAAL_STATUE_SHORT",
+    "offset": [ 0, 400, -90 ],
+    "radius": 300,
+    "strength": 25,
     "color": [
-      252,
-      190,
-      0
+      0,
+      140,
+      255
     ],
-    "type": "STATIC",
+    "type": "FLICKER",
     "duration": 0,
-    "range": 0,
+    "range": 7.5,
     "objectIds": [
-      "BIM_VAULT_WALL01"
+      "BIM_RUINS_WALLKIT_SACRED_FORGE_OP",
+      "BIM_RUINS_WALLKIT_SACRED_FORGE"
     ]
   },
   {
-    "description": "CAMDOZAAL_WATERFALL",
-    "height": 500,
-    "alignment": "CENTER",
-    "radius": 500,
-    "strength": 15,
+    "description": "CAMDOZAAL_VAULT_ORANGE_LIGHT",
+    "offset": [ 0, 50, 70 ],
+    "radius": 220,
+    "strength": 30,
     "color": [
-      255,
-      255,
-      255
+      252,
+      190,
+      0
     ],
-    "type": "STATIC",
+    "type": "FLICKER",
     "duration": 0,
-    "range": 0,
+    "range": 10,
     "objectIds": [
-      "CAVEKIT_WATERFALL_CAMDOZAAL"
+      "BIM_VAULT_WALL01"
     ]
   },
   {
     "description": "camdozaal lantern",
-    "height": 175,
-    "alignment": "BACK",
-    "radius": 300,
-    "strength": 25,
+    "offset": [ -34, 180, 26 ],
+    "radius": 325,
+    "strength": 20,
     "color": [
       252,
       148,
diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json
index 0d485cf2be..fb2d0d3a1c 100644
--- a/src/main/resources/rs117/hd/scene/model_overrides.json
+++ b/src/main/resources/rs117/hd/scene/model_overrides.json
@@ -2574,12 +2574,15 @@
       "BRAIN_ROCK_POOL_BITS",
       "FAIRYTALE2_ROCK_POOL_SMALL",
       "STALKER_DEN_STEPPING_STONE",
-      "FRISD_IZSO_ROCK_POOL_SMALL"
+      "FRISD_IZSO_ROCK_POOL_SMALL",
+      "BR_ROCK_POOL",
+      "BR_ROCK_POOL_SMALL",
+      "BR_ROCK_POOL_BITS"
     ],
     "uvType": "BOX",
     "colorOverrides": [
       {
-        "colors": [ "h == 42", "h == 35" ],
+        "colors": [ "h == 42", "h == 35", "h == 29 && s == 4" ],
         "baseMaterial": "GRAY_70",
         "hideAsWaterEffect": true
       }
@@ -30336,13 +30339,6 @@
       }
     ]
   },
-  {
-    "description": "Lassar Undercity - Hide Wall Filler to Prevent zFighting",
-    "hideInAreas": [ "LASSAR_UNDERCITY_DRAIN_DEPTH_FIX_FILLER" ],
-    "objectIds": [
-      "BIM_RUINS_WALLKIT_WALLTOP05"
-    ]
-  },
   {
     "description": "Lassar Undercity - Hide Wall Filler to Prevent zFighting",
     "baseMaterial": "SMOOTH_STONE",
@@ -46164,7 +46160,8 @@
   },
   {
     "description": "Camdozaal Carved Walls and Pillars",
-    "baseMaterial": "GRUNGE_3",
+    "baseMaterial": "SMOOTH_STONE",
+    "hideInAreas": [ "LASSAR_UNDERCITY_DRAIN_DEPTH_FIX_FILLER" ],
     "objectIds": [
       "BIM_RUINS_WALLKIT_WORKSHOP01",
       "BIM_RUINS_WALLKIT_CORNER01",
@@ -46174,14 +46171,36 @@
       "BIM_RUINS_WALLKIT_FILLER01",
       "BIM_RUINS_WALLKIT_FILLER02",
       "BIM_RUINS_WALLKIT_FILLER03",
+      "BIM_RUINS_WALLKIT_WALLTOP01",
+      "BIM_RUINS_WALLKIT_WALLTOP02",
       "BIM_RUINS_ENTRANCE_STATUE",
+      "BIM_RUINS_WALLKIT_WALLTOP05",
+      "BIM_RUINS_WALLKIT_WALLTOP03",
+      "BIM_RUINS_WALLKIT_WALLTOP04",
       "DUNGEONKIT_IMCANDO_PILLAR01"
     ],
     "uvType": "BOX"
   },
+  {
+    "description": "Camdozaal Crystals",
+    "upwardsNormals": true,
+    "objectIds": [
+      "DECOKIT_CRYSTAL_BARRONITE01",
+      "DECOKIT_CRYSTAL_BARRONITE02",
+      "DECOKIT_CRYSTAL_BARRONITE03"
+    ]
+  },
+  {
+    "description": "Camdozaal Golem",
+    "baseMaterial": "GRAY_75",
+    "objectIds": [
+      "RUBBLE_GOLEM_2X2",
+      "RUBBLE_GOLEM_1X1"
+    ]
+  },
   {
     "description": "Camdozaal Vault Walls",
-    "baseMaterial": "GRUNGE_3",
+    "baseMaterial": "SMOOTH_STONE",
     "objectIds": [
       "BIM_VAULT_WALL01",
       "BIM_VAULT_WALL02",
@@ -46191,7 +46210,9 @@
       "BIM_VAULT_WALL06",
       "BIM_VAULT_CORNER01",
       "BIM_VAULT_CORNER02",
-      "BIM_VAULT_CORNER03"
+      "BIM_VAULT_CORNER03",
+      "BIM_VAULT_WALLKIT_WALLTOP01",
+      "BIM_RUINS_PRESSUREPLATE"
     ],
     "uvType": "BOX"
   },
@@ -46207,7 +46228,7 @@
   },
   {
     "description": "Camdozaal House Walls",
-    "baseMaterial": "GRUNGE_3",
+    "baseMaterial": "SMOOTH_STONE",
     "uvType": "BOX",
     "colorOverrides": [
       {
@@ -46215,7 +46236,8 @@
         "colors": "h == 5",
         "baseMaterial": "METALLIC_1_LIGHT_GLOSS",
         "uvType": "BOX",
-        "uvOrientation": 700
+        "uvScale": 0.2,
+        "uvOrientation": 512
       }
     ],
     "objectIds": [
@@ -46228,7 +46250,7 @@
   },
   {
     "description": "Camdozaal Wall Statue - static",
-    "baseMaterial": "GRUNGE_3",
+    "baseMaterial": "SMOOTH_STONE",
     "uvType": "BOX",
     "colorOverrides": [
       {
@@ -46246,7 +46268,7 @@
   },
   {
     "description": "Camdozaal Wall Statues - Dynamic",
-    "baseMaterial": "GRUNGE_3",
+    "baseMaterial": "SMOOTH_STONE",
     "uvType": "BOX",
     "objectIds": [
       "BIM_RUINS_WALLKIT_STREETLAMP01"
@@ -46254,13 +46276,14 @@
     "colorOverrides": [
       {
         "colors": "a < 255",
-        "baseMaterial": "NONE"
+        "baseMaterial": "NONE",
+        "upwardsNormals": true
       }
     ]
   },
   {
     "description": "Camdozaal Barronite Walls",
-    "baseMaterial": "ROCK_3",
+    "baseMaterial": "ROCK_3_SEMI_SMOOTH",
     "objectIds": [
       "CAMDOZAALROCK1", "CAMDOZAALROCK2"
     ],
@@ -46269,14 +46292,24 @@
   },
   {
     "description": "Camdozaal Sacred Forge",
-    "baseMaterial": "GRUNGE_3",
+    "baseMaterial": "SMOOTH_STONE",
     "objectIds": [
       "BIM_RUINS_WALLKIT_SACRED_FORGE_MULTI",
       "BIM_RUINS_WALLKIT_SACRED_FORGE_OP"
     ],
     "uvType": "BOX",
     "uvOrientation": 512,
-    "uvScale": 0.7
+    "uvScale": 0.7,
+    "colorOverrides": [
+      {
+        "colors": "h == 5",
+        "baseMaterial": "METALLIC_1_LIGHT"
+      },
+      {
+        "colors": "a < 255 || h == 7",
+        "baseMaterial": "NONE"
+      }
+    ]
   },
   {
     "description": "Camdozaal Rock Piles - Large",
@@ -46430,18 +46463,12 @@
     "objectIds": [
       "CAMDOZAAL_PREPARATION_TABLE"
     ],
-    "uvType": "BOX",
-    "uvOrientation": 768,
-    "uvScale": 0.6
+    "uvType": "BOX"
   },
   {
     "description": "Camdozaal Altar",
-    "baseMaterial": "STONE_NORMALED",
+    "baseMaterial": "SMOOTH_STONE",
     "uvType": "BOX",
-    "uvOrientationY": 256,
-    "uvOrientationZ": 768,
-    "uvOrientationX": 768,
-    "uvScale": 0.6,
     "colorOverrides": [
       {
         "description": "Metal",
@@ -46672,9 +46699,7 @@
   },
   {
     "description": "Camdozaal Stalactite post and lamp",
-    "baseMaterial": "GRUNGE_3",
-    "uvType": "BOX",
-    "uvOrientation": 343,
+    "baseMaterial": "METALLIC_1_LIGHT",
     "colorOverrides": [
       {
         "description": "Rock",
@@ -46694,7 +46719,8 @@
         "colors": "h == 6 && s == 4",
         "baseMaterial": "ROPE",
         "uvType": "BOX",
-        "uvOrientation": 42
+        "uvOrientation": 42,
+        "uvScale": 0.5
       }
     ],
     "objectIds": [
@@ -46714,6 +46740,13 @@
       "KOUREND_ARCH_FOOTPATH_10"
     ]
   },
+  {
+    "description": "Camdozaal Waterfall",
+    "baseMaterial": "GRAY_60",
+    "objectIds": [
+      "CAVEKIT_WATERFALL_CAMDOZAAL"
+    ]
+  },
   {
     "description": "Seers Coal Mine Fence",
     "baseMaterial": "METALLIC_1_LIGHT_SEMIGLOSS",
diff --git a/src/main/resources/rs117/hd/scene/tile_overrides.json b/src/main/resources/rs117/hd/scene/tile_overrides.json
index 5aeab58d09..09df71a889 100644
--- a/src/main/resources/rs117/hd/scene/tile_overrides.json
+++ b/src/main/resources/rs117/hd/scene/tile_overrides.json
@@ -5729,7 +5729,7 @@
     "overlayIds": [
       181
     ],
-    "waterType": "WATER",
+    "waterType": "CAVE_WATER_MURKY",
     "blended": false
   },
   {
@@ -5749,21 +5749,9 @@
     "name": "CAMDOZAAL_STONE_PATH",
     "area": "CAMDOZAAL",
     "overlayIds": [
-      182
-    ],
-    "groundMaterial": "GRUNGE_2",
-    "uvOrientation": 117,
-    "uvScale": 1.2
-  },
-  {
-    "name": "CAMDOZAAL_GRAVEL_PATH",
-    "area": "CAMDOZAAL",
-    "overlayIds": [
-      2, 83, 127
+      2, 83, 127, 182
     ],
-    "groundMaterial": "GRAVEL",
-    "uvOrientation": 270,
-    "uvScale": 1.25
+    "groundMaterial": "PACKED_EARTH"
   },
   {
     "name": "CAMDOZAAL_CAVE_FLOOR",