diff --git a/Resources/Prototypes/_Floof/Traits/physical.yml b/Resources/Prototypes/_Floof/Traits/physical.yml
index e7d182cdf1..9469281533 100644
--- a/Resources/Prototypes/_Floof/Traits/physical.yml
+++ b/Resources/Prototypes/_Floof/Traits/physical.yml
@@ -37,17 +37,17 @@
       protoId: JawsOfLifeRightArm
       slotId: "right arm"
 
-- type: trait
-  id: CyberEyesFlare
-  name: trait-name-CyberEyesFlare
-  description: trait-description-CyberEyesFlare
+- type: trait # Gives the effect of printable cybernetic eyes except no one has coded organ replacements yet
+  id: CyberEyes
+  name: trait-name-CyberEyes
+  description: trait-description-CyberEyes
   category: Medical
-  cost: 8
+  cost: 6 # Cost balanced
   conflicts:
   - Blindness
   - PoorVision
   effects:
-  - !type:AddCompsEffect
+  - !type:AddCompsEffect # To do - When someone codes organ replacement
     components:
     - type: FlashImmunity
       showInExamine: false
@@ -58,7 +58,7 @@
   category: Medical
   name: trait-name-CyberEyesNightVision
   description: trait-description-CyberEyesNightVision
-  cost: 8
+  cost: 7
   conflicts:
   - Blindness
   - PoorVision
@@ -78,17 +78,54 @@
     components:
     - type: NightVision
 
+- type: trait
+  id: CyberEyesThermoVision
+  category: Medical
+  name: trait-name-CyberEyesThermoVision
+  description: trait-description-CyberEyesThermoVision
+  cost: 7
+  conflicts:
+  - Blindness
+  - PoorVision
+  conditions:
+  - !type:HasJobCondition
+    invert: true
+    job: Prisoner
+  effects:
+  - !type:AddCompsEffect
+    components:
+    - type: ThermalVision
+      pulseTime: 2
+      toggleAction: PulseThermalVision
+
 - type: trait
   id: CyberEyesSecurity
   category: Medical
   name: trait-name-CyberEyesSecurity
   description: trait-description-CyberEyesSecurity
-  cost: 4
+  cost: 3
   conflicts:
   - CyberEyesOmni
   conditions:
   - !type:InDepartmentCondition
     department: Security
+  - !type:HasJobCondition
+    invert: true
+    job: Prisoner
+  - !type:HasJobCondition
+    job: SecurityCadet
+  - !type:HasJobCondition
+    job: SecurityOfficer
+  - !type:HasJobCondition
+    job: Detective
+  - !type:HasJobCondition
+    job: Warden
+  - !type:HasJobCondition
+    job: HeadOfSecurity
+  - !type:HasJobCondition
+    job: Brigmedic
+  - !type:HasJobCondition
+    job: SeniorOfficer
   effects:
   - !type:AddCompsEffect
     components:
@@ -101,12 +138,13 @@
   category: Medical
   name: trait-name-CyberEyesMedical
   description: trait-description-CyberEyesMedical
-  cost: 4
+  cost: 3
   conflicts:
-    - CyberEyesOmni
+  - CyberEyesOmni
   effects:
   - !type:AddCompsEffect
     components:
+    - type: SolutionScanner
     - type: ShowHealthBars
       damageContainers:
       - Biological
@@ -116,25 +154,59 @@
       - Biological
       - BiologicalMetaphysical
 
+#- type: trait
+#  id: CyberEyesDiagnostic
+#  category: Medical
+#  name: trait-name-CyberEyesDiagnostic
+#  description: trait-description-CyberEyesDiagnostic
+#  cost: 3
+#  conflicts:
+#  - CyberEyesOmni
+#  effects:
+#  - !type:AddCompsEffect
+#    components:
+#    - type: ShowHealthBars
+#      damageContainers:
+#      - Inorganic
+#      - Silicon
+#      - HumanoidSilicon
+#    - type: ShowAccessReaderSettings
+
 - type: trait
   id: CyberEyesOmni
   category: Medical
   name: trait-name-CyberEyesOmni
   description: trait-description-CyberEyesOmni
-  cost: 6
+  cost: 4
   conflicts:
   - CyberEyesMedical
   - CyberEyesSecurity
+  #- CyberEyesDiagnostic
   conditions:
   - !type:InDepartmentCondition
     department: Command
+  - !type:HasJobCondition
+    invert: true
+    job: Prisoner
+  - !type:HasJobCondition # God forbid DV have all the heads also be in commeand
+    job: HeadOfSecurity
+  - !type:HasJobCondition
+    job: ChiefMedicalOfficer
+  - !type:HasJobCondition
+    job: Quartermaster
+  - !type:HasJobCondition
+    job: ChiefEngineer
+  - !type:HasJobCondition
+    job: ResearchDirector
+  - !type:HasJobCondition
+    job: ChiefJustice
   effects:
   - !type:AddCompsEffect
     components:
     - type: ShowJobIcons
     - type: ShowMindShieldIcons
     - type: ShowCriminalRecordIcons
-    #- type: SolutionScanner
+    - type: SolutionScanner
     - type: ShowHealthIcons
       damageContainers:
       - Biological
@@ -143,6 +215,10 @@
       damageContainers:
       - Biological
       - BiologicalMetaphysical
+      - Inorganic
+      - Silicon
+      - HumanoidSilicon
+
 # =================================================== #
 
 # ================= Stamina traits ================== #