diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling.yml
deleted file mode 100644
index b4e6de974f..0000000000
--- a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-- type: marking
-  id: CPTieflingTail
-  bodyPart: Tail
-  markingCategory: Tail
-  speciesRestriction: [ CPTiefling ]
-  sprites:
-    - sprite: Mobs/Customization/cat_parts.rsi
-      state: tail_cat
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling_horns.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling_horns.yml
new file mode 100644
index 0000000000..8600761f49
--- /dev/null
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling_horns.yml
@@ -0,0 +1,85 @@
+
+- type: marking
+  id: CPTieflingHorns
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [ CPTiefling ]
+  sprites:
+    - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi
+      state: horn1
+
+- type: marking
+  id: CPTieflingHorns2
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [ CPTiefling ]
+  sprites:
+    - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi
+      state: horn2
+
+- type: marking
+  id: CPTieflingHorns3
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [ CPTiefling ]
+  followSkinColor: true
+  forcedColoring: true
+  sprites:
+    - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi
+      state: horn3
+
+- type: marking
+  id: CPTieflingHorns3Broken
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [ CPTiefling ]
+  followSkinColor: true
+  forcedColoring: true
+  sprites:
+    - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi
+      state: horn3_broken
+
+- type: marking
+  id: CPTieflingHorns4
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [ CPTiefling ]
+  followSkinColor: true
+  forcedColoring: true
+  sprites:
+    - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi
+      state: horn4
+
+- type: marking
+  id: CPTieflingHorns5
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [ CPTiefling ]
+  followSkinColor: true
+  forcedColoring: true
+  sprites:
+    - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi
+      state: horn5
+
+- type: marking
+  id: CPTieflingHorns5Broken
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [ CPTiefling ]
+  followSkinColor: true
+  forcedColoring: true
+  sprites:
+    - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi
+      state: horn5_broken
+
+- type: marking
+  id: CPTieflingHorns6
+  bodyPart: HeadTop
+  markingCategory: HeadTop
+  speciesRestriction: [ CPTiefling ]
+  followSkinColor: true
+  forcedColoring: true
+  sprites:
+    - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi
+      state: horn6
+
diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling_tails.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling_tails.yml
new file mode 100644
index 0000000000..fbc4e4b9ee
--- /dev/null
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling_tails.yml
@@ -0,0 +1,21 @@
+- type: marking
+  id: CPTieflingTail
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [ CPTiefling ]
+  followSkinColor: true
+  forcedColoring: true
+  sprites:
+    - sprite: _CP14/Mobs/Customization/tiefling_tails.rsi
+      state: tail1
+
+- type: marking
+  id: CPTieflingTailSpades
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [ CPTiefling ]
+  followSkinColor: true
+  forcedColoring: true
+  sprites:
+    - sprite: _CP14/Mobs/Customization/tiefling_tails.rsi
+      state: tail_spades
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml
index 80caf96b62..c6cb9a0fc1 100644
--- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml
@@ -14,6 +14,7 @@
       sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi
       state: full
     - type: Thirst
+    - type: Wagging
 
 - type: entity
   parent: BaseSpeciesDummy
diff --git a/Resources/Prototypes/_CP14/Species/human.yml b/Resources/Prototypes/_CP14/Species/human.yml
index 9ff3f43bea..c4e8de6cbf 100644
--- a/Resources/Prototypes/_CP14/Species/human.yml
+++ b/Resources/Prototypes/_CP14/Species/human.yml
@@ -12,9 +12,9 @@
   id: CPMobHumanSprites
   sprites:
     Head: CPMobHumanHead
-    Hair: MobHumanoidAnyMarking
-    FacialHair: MobHumanoidAnyMarking
-    Snout: MobHumanoidAnyMarking
+    Hair: CPMobHumanoidAnyMarking
+    FacialHair: CPMobHumanoidAnyMarking
+    Snout: CPMobHumanoidAnyMarking
     Chest: CPMobHumanTorso
     Eyes: CPMobHumanoidEyes
     LArm: CPMobHumanLArm
diff --git a/Resources/Prototypes/_CP14/Species/tiefling.yml b/Resources/Prototypes/_CP14/Species/tiefling.yml
index 6c578e521d..b83afcbd91 100644
--- a/Resources/Prototypes/_CP14/Species/tiefling.yml
+++ b/Resources/Prototypes/_CP14/Species/tiefling.yml
@@ -17,25 +17,25 @@
 - type: speciesBaseSprites
   id: CPMobTieflingSprites
   sprites:
-    Head: MobTieflingHead
-    Hair: MobTieflingAnyMarking
-    FacialHair: MobTieflingAnyMarking
-    Snout: MobTieflingAnyMarking
-    Tail: MobTieflingAnyMarking
-    Chest: MobTieflingTorso
-    Eyes: MobTieflingEyes
-    LArm: MobTieflingLArm
-    RArm: MobTieflingRArm
-    LHand: MobTieflingLHand
-    RHand: MobTieflingRHand
-    LLeg: MobTieflingLLeg
-    RLeg: MobTieflingRLeg
-    LFoot: MobTieflingLFoot
-    RFoot: MobTieflingRFoot
+    Head: CPMobTieflingHead
+    HeadTop: CPMobTieflingMarkingMatchSkin
+    Hair: CPMobTieflingAnyMarking
+    FacialHair: CPMobTieflingAnyMarking
+    Snout: CPMobTieflingMarkingMatchSkin
+    Tail: CPMobTieflingMarkingMatchSkin
+    Chest: CPMobTieflingTorso
+    Eyes: CPMobTieflingEyes
+    LArm: CPMobTieflingLArm
+    RArm: CPMobTieflingRArm
+    LHand: CPMobTieflingLHand
+    RHand: CPMobTieflingRHand
+    LLeg: CPMobTieflingLLeg
+    RLeg: CPMobTieflingRLeg
+    LFoot: CPMobTieflingLFoot
+    RFoot: CPMobTieflingRFoot
 
 - type: markingPoints
   id: CPMobTieflingMarkingLimits
-  onlyWhitelisted: true
   points:
     Hair:
       points: 1
@@ -52,7 +52,8 @@
       defaultMarkings: [ CPTieflingTail ]
     HeadTop:
       points: 1
-      required: false
+      required: true
+      defaultMarkings: [ CPTieflingHorns ]
     Chest:
       points: 1
       required: false
@@ -64,98 +65,98 @@
       required: false
 
 - type: humanoidBaseSprite
-  id: MobTieflingEyes
+  id: CPMobTieflingEyes
   baseSprite:
     sprite: Mobs/Customization/eyes.rsi
     state: eyes
 
 - type: humanoidBaseSprite
-  id: MobTieflingAnyMarking
+  id: CPMobTieflingAnyMarking
 
 - type: humanoidBaseSprite
-  id: MobTieflingMarkingMatchSkin
+  id: CPMobTieflingMarkingMatchSkin
   markingsMatchSkin: true
 
 - type: humanoidBaseSprite
-  id: MobTieflingHead
+  id: CPMobTieflingHead
   baseSprite:
     sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi
     state: head_m
 
 - type: humanoidBaseSprite
-  id: MobTieflingHeadMale
+  id: CPMobTieflingHeadMale
   baseSprite:
     sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi
     state: head_m
 
 - type: humanoidBaseSprite
-  id: MobTieflingHeadFemale
+  id: CPMobTieflingHeadFemale
   baseSprite:
     sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi
     state: head_f
 
 - type: humanoidBaseSprite
-  id: MobTieflingTorso
+  id: CPMobTieflingTorso
   baseSprite:
     sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi
     state: torso_m
 
 - type: humanoidBaseSprite
-  id: MobTieflingTorsoMale
+  id: CPMobTieflingTorsoMale
   baseSprite:
     sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi
     state: torso_m
 
 - type: humanoidBaseSprite
-  id: MobTieflingTorsoFemale
+  id: CPMobTieflingTorsoFemale
   baseSprite:
     sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi
     state: torso_f
 
 - type: humanoidBaseSprite
-  id: MobTieflingLLeg
+  id: CPMobTieflingLLeg
   baseSprite:
     sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi
     state: l_leg
 
 - type: humanoidBaseSprite
-  id: MobTieflingLArm
+  id: CPMobTieflingLArm
   baseSprite:
     sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi
     state: l_arm
 
 - type: humanoidBaseSprite
-  id: MobTieflingLHand
+  id: CPMobTieflingLHand
   baseSprite:
     sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi
     state: l_hand
 
 - type: humanoidBaseSprite
-  id: MobTieflingLFoot
+  id: CPMobTieflingLFoot
   baseSprite:
     sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi
     state: l_foot
 
 - type: humanoidBaseSprite
-  id: MobTieflingRLeg
+  id: CPMobTieflingRLeg
   baseSprite:
     sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi
     state: r_leg
 
 - type: humanoidBaseSprite
-  id: MobTieflingRArm
+  id: CPMobTieflingRArm
   baseSprite:
     sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi
     state: r_arm
 
 - type: humanoidBaseSprite
-  id: MobTieflingRHand
+  id: CPMobTieflingRHand
   baseSprite:
     sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi
     state: r_hand
 
 - type: humanoidBaseSprite
-  id: MobTieflingRFoot
+  id: CPMobTieflingRFoot
   baseSprite:
     sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi
     state: r_foot
diff --git a/Resources/Textures/_CP14/Mobs/Customization/tiefling_tails.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Customization/tiefling_tails.rsi/meta.json
index dcaa9703e4..d952a90435 100644
--- a/Resources/Textures/_CP14/Mobs/Customization/tiefling_tails.rsi/meta.json
+++ b/Resources/Textures/_CP14/Mobs/Customization/tiefling_tails.rsi/meta.json
@@ -54,7 +54,7 @@
       ]
     },
     {
-      "name": "tail2",
+      "name": "tail_spades",
       "directions": 4,
       "delays": [
         [
diff --git a/Resources/Textures/_CP14/Mobs/Customization/tiefling_tails.rsi/tail2.png b/Resources/Textures/_CP14/Mobs/Customization/tiefling_tails.rsi/tail_spades.png
similarity index 100%
rename from Resources/Textures/_CP14/Mobs/Customization/tiefling_tails.rsi/tail2.png
rename to Resources/Textures/_CP14/Mobs/Customization/tiefling_tails.rsi/tail_spades.png