diff --git a/Content.IntegrationTests/Tests/EntityTest.cs b/Content.IntegrationTests/Tests/EntityTest.cs
index 6b8b59a12c..78baca49e8 100644
--- a/Content.IntegrationTests/Tests/EntityTest.cs
+++ b/Content.IntegrationTests/Tests/EntityTest.cs
@@ -40,6 +40,7 @@ namespace Content.IntegrationTests.Tests
                     .Where(p => !pair.IsTestPrototype(p))
                     .Where(p => !p.Components.ContainsKey("MapGrid")) // This will smash stuff otherwise.
                     .Where(p => !p.Components.ContainsKey("RoomFill")) // This comp can delete all entities, and spawn others
+                    .Where(p => !p.Components.ContainsKey("CP14BiomeSpawner")) // CP14 this component delete all entities on this tile
                     .Select(p => p.ID)
                     .ToList();
 
@@ -103,6 +104,7 @@ namespace Content.IntegrationTests.Tests
                     .Where(p => !pair.IsTestPrototype(p))
                     .Where(p => !p.Components.ContainsKey("MapGrid")) // This will smash stuff otherwise.
                     .Where(p => !p.Components.ContainsKey("RoomFill")) // This comp can delete all entities, and spawn others
+                    .Where(p => !p.Components.ContainsKey("CP14BiomeSpawner")) // CP14 this component delete all entities on this tile
                     .Select(p => p.ID)
                     .ToList();
                 foreach (var protoId in protoIds)
@@ -344,6 +346,7 @@ namespace Content.IntegrationTests.Tests
                 "DebugExceptionStartup",
                 "GridFill",
                 "RoomFill",
+                "CP14BiomeSpawner", // CP14 this component delete all entities on this tile
                 "Map", // We aren't testing a map entity in this test
                 "MapGrid",
                 "Broadphase",
diff --git a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Constrained/test_xeno.yml b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Constrained/test_xeno.yml
deleted file mode 100644
index 0c66e703cd..0000000000
--- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Constrained/test_xeno.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-- type: entity
-  id: CP14ConstrainedSpawnerBase
-  abstract: true
-  parent: MarkerBase
-  description: lol
-  categories: [ ForkFiltered ]
-  components:
-  - type: Sprite
-    layers:
-      - state: red
-  - type: Physics
-    bodyType: Static
-    fixedRotation: true
-  - type: Fixtures
-    fixtures:
-      spawn:
-        shape:
-          !type:PhysShapeCircle
-          radius: 15
-        hard: false
-        layer:
-          - AllMask
-  - type: TriggerOnCollide
-    fixtureID: spawn
-  - type: StepTrigger
-    requiredTriggeredSpeed: 0
-    stepOn: true
-
-- type: entity
-  parent: CP14ConstrainedSpawnerBase
-  id: CP14ConstrainedSpawnerXeno
-  name: xeno constrained spawner
-  components:
-  - type: TriggerOnCollide
-    fixtureID: spawn
-  - type: CP14ConstrainedSpawnerOnTrigger
-    prototypes:
-    - CP14MobXeno
-    - CP14MobXenoDrone
-    - CP14MobSpaceCobra
-    - CP14MobSmallPurpleSnake
-    - CP14MobPurpleSnake
-    - MobLuminousEntity
-    - MobLuminousObject
-    - CP14MobWatcherMagmawing
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/watcher.yml b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/watcher.yml
index 937ad9e32c..ba4309ccda 100644
--- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/watcher.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/watcher.yml
@@ -45,8 +45,10 @@
       0: Alive
       50: Dead
   - type: MovementSpeedModifier
-    baseWalkSpeed: 5
-    baseSprintSpeed: 7
+    baseWalkSpeed: 2
+    baseSprintSpeed: 4
+    friction: 0.5
+    acceleration: 3
   - type: ProjectileBatteryAmmoProvider
     proto: WatcherBolt
     fireCost: 50
diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/xeno_test.yml b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/xeno_test.yml
deleted file mode 100644
index 30eb20cfc0..0000000000
--- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/xeno_test.yml
+++ /dev/null
@@ -1,84 +0,0 @@
-- type: entity
-  id: CP14MobXeno
-  parent: MobXeno
-  categories: [ ForkFiltered ]
-  components:
-  - type: NpcFactionMember
-    factions:
-    - CP14Monster
-
-- type: entity
-  id: CP14MobXenoDrone
-  parent: MobXenoDrone
-  categories: [ ForkFiltered ]
-  components:
-  - type: NpcFactionMember
-    factions:
-    - CP14Monster
-
-- type: entity
-  id: CP14MobSpaceCobra
-  name: cobra
-  parent: MobCobraSpace
-  categories: [ ForkFiltered ]
-  components:
-  - type: NpcFactionMember
-    factions:
-    - CP14Monster
-  - type: MeleeChemicalInjector
-    transferAmount: 2
-  - type: MeleeWeapon
-    hidden: true
-    soundHit:
-      path: /Audio/Effects/bite.ogg
-    angle: 0
-    animation: WeaponArcBite
-    damage:
-      types:
-        Piercing: 2
-        Poison: 2
-
-- type: entity
-  id: CP14MobPurpleSnake
-  parent: MobPurpleSnake
-  categories: [ ForkFiltered ]
-  components:
-  - type: NpcFactionMember
-    factions:
-    - CP14Monster
-  - type: MeleeWeapon
-    angle: 0
-    animation: WeaponArcBite
-    damage:
-      types:
-        Piercing: 1
-  - type: MeleeChemicalInjector
-    transferAmount: 3
-
-- type: entity
-  id: CP14MobSmallPurpleSnake
-  parent: MobSmallPurpleSnake
-  categories: [ ForkFiltered ]
-  components:
-  - type: NpcFactionMember
-    factions:
-    - CP14Monster
-  - type: SolutionTransfer
-    maxTransferAmount: 0.2
-  - type: MeleeWeapon
-    angle: 0
-    animation: WeaponArcBite
-    damage:
-      types:
-        Piercing: 0.5
-  - type: MeleeChemicalInjector
-    transferAmount: 2
-
-- type: entity
-  id: CP14MobWatcherMagmawing
-  parent: MobWatcherMagmawing
-  categories: [ ForkFiltered ]
-  components:
-  - type: NpcFactionMember
-    factions:
-    - CP14Monster
diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Floor/floorWater.yml b/Resources/Prototypes/_CP14/Entities/Structures/Floor/floorWater.yml
index 8f748dbe9a..da0df938e3 100644
--- a/Resources/Prototypes/_CP14/Entities/Structures/Floor/floorWater.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Floor/floorWater.yml
@@ -71,7 +71,6 @@
   suffix: Deep, Air damage
   components:
   - type: Sprite
-    drawdepth: OverMobs
     color: "#869dc2"
   - type: SpeedModifierContacts
     walkSpeedModifier: 0.2
diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml
index b3b5f55279..5725278888 100644
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml
@@ -220,7 +220,7 @@
   - CP14DemiplaneHot
   layers:
     - !type:OreDunGen
-      entity: CP14MobSlimeBase
+      entity: CP14MobWatcherIce
       count: 2
       minGroupSize: 2
       maxGroupSize: 3
@@ -239,7 +239,7 @@
   - CP14DemiplaneCold
   layers:
     - !type:OreDunGen
-      entity: CP14MobSlimeBase
+      entity: CP14MobWatcherMagma
       count: 2
       minGroupSize: 2
       maxGroupSize: 3
diff --git a/Resources/Prototypes/_CP14/Species/silva.yml b/Resources/Prototypes/_CP14/Species/silva.yml
index f9158b1170..e408bb0607 100644
--- a/Resources/Prototypes/_CP14/Species/silva.yml
+++ b/Resources/Prototypes/_CP14/Species/silva.yml
@@ -10,6 +10,7 @@
   defaultSkinTone: "#6c741d"
   maleFirstNames: CP14_Names_Silva_Male_First
   femaleFirstNames: CP14_Names_Silva_Female_First
+  naming: First
 
 - type: speciesBaseSprites
   id: CP14MobSilvaSprites
diff --git a/Resources/Textures/_CP14/Objects/Tools/crystal_lamp.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/Tools/crystal_lamp.rsi/equipped-BELT1.png
index 5e39094069..8b9006d5cb 100644
Binary files a/Resources/Textures/_CP14/Objects/Tools/crystal_lamp.rsi/equipped-BELT1.png and b/Resources/Textures/_CP14/Objects/Tools/crystal_lamp.rsi/equipped-BELT1.png differ
diff --git a/Resources/Textures/_CP14/Objects/Tools/crystal_lamp.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/Tools/crystal_lamp.rsi/equipped-BELT2.png
index f35f431cbb..8bb20b5159 100644
Binary files a/Resources/Textures/_CP14/Objects/Tools/crystal_lamp.rsi/equipped-BELT2.png and b/Resources/Textures/_CP14/Objects/Tools/crystal_lamp.rsi/equipped-BELT2.png differ