diff --git a/1.5/Defs/PreceptDefs/Precepts_SocialAffection.xml b/1.5/Defs/PreceptDefs/Precepts_SocialAffection.xml
index b4ee222..fe10b90 100644
--- a/1.5/Defs/PreceptDefs/Precepts_SocialAffection.xml
+++ b/1.5/Defs/PreceptDefs/Precepts_SocialAffection.xml
@@ -1,62 +1,62 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <Defs>
 
-  <!-- Issues -->
-  <IssueDef>
-    <defName>SocialAffection</defName>
-    <label>social affection</label>
-    <iconPath>UI/Issues/SocialAffection</iconPath>
-  </IssueDef>
+	<!-- Issues -->
+	<IssueDef>
+		<defName>SocialAffection</defName>
+		<label>social affection</label>
+		<iconPath>UI/Issues/SocialAffection</iconPath>
+	</IssueDef>
 
-  <!-- Precepts -->
+	<!-- Precepts -->
 
-  <PreceptDef>
-    <defName>SocialAffection_Normal</defName>
-    <issue>SocialAffection</issue>
-    <label>normal(vanilla)</label>
-    <description>Just normal.</description>
-    <impact>Low</impact>
-    <displayOrderInIssue>50</displayOrderInIssue>
-    <displayOrderInImpact>1000</displayOrderInImpact>
-  </PreceptDef>
+	<PreceptDef>
+		<defName>SocialAffection_Normal</defName>
+		<issue>SocialAffection</issue>
+		<label>normal(vanilla)</label>
+		<description>Just normal.</description>
+		<impact>Low</impact>
+		<displayOrderInIssue>50</displayOrderInIssue>
+		<displayOrderInImpact>1000</displayOrderInImpact>
+	</PreceptDef>
 
-  <PreceptDef>
-    <defName>SocialAffection_Small</defName>
-    <issue>SocialAffection</issue>
-    <label>only immediate family</label>
-    <description>Care about only immediate family.</description>
-    <impact>Medium</impact>
-    <displayOrderInIssue>40</displayOrderInIssue>
-    <displayOrderInImpact>1000</displayOrderInImpact>
-  </PreceptDef>
+	<PreceptDef>
+		<defName>SocialAffection_Small</defName>
+		<issue>SocialAffection</issue>
+		<label>only immediate family</label>
+		<description>Care about only immediate family.</description>
+		<impact>Medium</impact>
+		<displayOrderInIssue>40</displayOrderInIssue>
+		<displayOrderInImpact>1000</displayOrderInImpact>
+	</PreceptDef>
 
-  <PreceptDef>
-    <defName>SocialAffection_OnlyFamily</defName>
-    <issue>SocialAffection</issue>
-    <label>only family</label>
-    <description>Don't care about non-family memeber's tragedy.</description>
-    <impact>Medium</impact>
-    <displayOrderInIssue>30</displayOrderInIssue>
-    <displayOrderInImpact>1000</displayOrderInImpact>
-  </PreceptDef>
+	<PreceptDef>
+		<defName>SocialAffection_OnlyFamily</defName>
+		<issue>SocialAffection</issue>
+		<label>only family</label>
+		<description>Don't care about the tragedy of a non-family member.</description>
+		<impact>Medium</impact>
+		<displayOrderInIssue>30</displayOrderInIssue>
+		<displayOrderInImpact>1000</displayOrderInImpact>
+	</PreceptDef>
 
-  <PreceptDef>
-    <defName>SocialAffection_Dry</defName>
-    <issue>SocialAffection</issue>
-    <label>not family</label>
-    <description>Don't care about family memeber's tragedy.</description>
-    <impact>High</impact>
-    <displayOrderInIssue>20</displayOrderInIssue>
-    <displayOrderInImpact>1000</displayOrderInImpact>
-  </PreceptDef>
+	<PreceptDef>
+		<defName>SocialAffection_Dry</defName>
+		<issue>SocialAffection</issue>
+		<label>not family</label>
+		<description>Don't care about the tragedy of a family member.</description>
+		<impact>High</impact>
+		<displayOrderInIssue>20</displayOrderInIssue>
+		<displayOrderInImpact>1000</displayOrderInImpact>
+	</PreceptDef>
 
-  <PreceptDef>
-    <defName>SocialAffection_Psychopath</defName>
-    <issue>SocialAffection</issue>
-    <label>Psychopath</label>
-    <description>Don't care about others.</description>
-    <impact>High</impact>
-    <displayOrderInIssue>10</displayOrderInIssue>
-    <displayOrderInImpact>1000</displayOrderInImpact>
-  </PreceptDef>
+	<PreceptDef>
+		<defName>SocialAffection_Psychopath</defName>
+		<issue>SocialAffection</issue>
+		<label>Psychopath</label>
+		<description>Don't care about others.</description>
+		<impact>High</impact>
+		<displayOrderInIssue>10</displayOrderInIssue>
+		<displayOrderInImpact>1000</displayOrderInImpact>
+	</PreceptDef>
 </Defs>
\ No newline at end of file
diff --git a/1.5/Patches/RJW_ThoughtDefsDeath.xml b/1.5/Patches/Core_ThoughtDefsDeath.xml
similarity index 90%
rename from 1.5/Patches/RJW_ThoughtDefsDeath.xml
rename to 1.5/Patches/Core_ThoughtDefsDeath.xml
index 99ea439..3071e66 100644
--- a/1.5/Patches/RJW_ThoughtDefsDeath.xml
+++ b/1.5/Patches/Core_ThoughtDefsDeath.xml
@@ -2,9 +2,9 @@
 
 <Patch>
 	<Operation Class="PatchOperationConditional">
-		<xpath>Defs/ThoughtDef[defName="MyKinDied" or defName="MyCousinDied" or defName="MyGrandparentDied" or defName="MyUncleDied" or defName="MyAuntDied" or defName="MyHalfSiblingDied" or defName="MyNephewDied" or defName="MyNieceDied" or defName="MyHalfSiblingDied" or defName="MyHalfSiblingDied" or defName="MyHalfSiblingDied"]/nullifyingPrecepts</xpath>
+		<xpath>Defs/ThoughtDef[defName="MyKinDied" or defName="MyCousinDied" or defName="MyGrandparentDied" or defName="MyUncleDied" or defName="MyAuntDied" or defName="MyHalfSiblingDied" or defName="MyNephewDied" or defName="MyNieceDied"]/nullifyingPrecepts</xpath>
 		<nomatch Class="PatchOperationAdd">
-			<xpath>Defs/ThoughtDef[defName="MyKinDied" or defName="MyCousinDied" or defName="MyGrandparentDied" or defName="MyUncleDied" or defName="MyAuntDied" or defName="MyHalfSiblingDied" or defName="MyNephewDied" or defName="MyNieceDied" or defName="MyHalfSiblingDied" or defName="MyHalfSiblingDied" or defName="MyHalfSiblingDied"]</xpath>
+			<xpath>Defs/ThoughtDef[defName="MyKinDied" or defName="MyCousinDied" or defName="MyGrandparentDied" or defName="MyUncleDied" or defName="MyAuntDied" or defName="MyHalfSiblingDied" or defName="MyNephewDied" or defName="MyNieceDied"]</xpath>
 			<value>
 				<nullifyingPrecepts>
 					<li>SocialAffection_Psychopath</li>
@@ -14,7 +14,7 @@
 			</value>
 		</nomatch>
 		<match Class="PatchOperationAdd">
-			<xpath>Defs/ThoughtDef[defName="MyKinDied" or defName="MyCousinDied" or defName="MyGrandparentDied" or defName="MyUncleDied" or defName="MyAuntDied" or defName="MyHalfSiblingDied" or defName="MyNephewDied" or defName="MyNieceDied" or defName="MyHalfSiblingDied" or defName="MyHalfSiblingDied" or defName="MyHalfSiblingDied"]/nullifyingPrecepts</xpath>
+			<xpath>Defs/ThoughtDef[defName="MyKinDied" or defName="MyCousinDied" or defName="MyGrandparentDied" or defName="MyUncleDied" or defName="MyAuntDied" or defName="MyHalfSiblingDied" or defName="MyNephewDied" or defName="MyNieceDied"]/nullifyingPrecepts</xpath>
 			<value>
 				<li>SocialAffection_Psychopath</li>
 				<li>SocialAffection_Dry</li>
diff --git a/1.5/Patches/RJW_ThoughtDefsLost.xml b/1.5/Patches/Core_ThoughtDefsLost.xml
similarity index 86%
rename from 1.5/Patches/RJW_ThoughtDefsLost.xml
rename to 1.5/Patches/Core_ThoughtDefsLost.xml
index 43dd8fb..5c94b8a 100644
--- a/1.5/Patches/RJW_ThoughtDefsLost.xml
+++ b/1.5/Patches/Core_ThoughtDefsLost.xml
@@ -2,9 +2,9 @@
 
 <Patch>
 	<Operation Class="PatchOperationConditional">
-		<xpath>Defs/ThoughtDef[defName="MyKinLost" or defName="MyCousinLost" or defName="MyGrandparentLost" or defName="MyUncleLost" or defName="MyAuntLost" or defName="MyHalfSiblingLost" or defName="MyNephewLost" or defName="MyNieceLost" or defName="MyHalfSiblingLost" or defName="MyHalfSiblingLost" or defName="MyHalfSiblingLost"]/nullifyingPrecepts</xpath>
+		<xpath>Defs/ThoughtDef[defName="MyKinLost" or defName="MyCousinLost" or defName="MyGrandparentLost" or defName="MyUncleLost" or defName="MyAuntLost" or defName="MyHalfSiblingLost" or defName="MyNephewLost" or defName="MyNieceLost"]/nullifyingPrecepts</xpath>
 		<nomatch Class="PatchOperationAdd">
-			<xpath>Defs/ThoughtDef[defName="MyKinLost" or defName="MyCousinLost" or defName="MyGrandparentLost" or defName="MyUncleLost" or defName="MyAuntLost" or defName="MyHalfSiblingLost" or defName="MyNephewLost" or defName="MyNieceLost" or defName="MyHalfSiblingLost" or defName="MyHalfSiblingLost" or defName="MyHalfSiblingLost"]</xpath>
+			<xpath>Defs/ThoughtDef[defName="MyKinLost" or defName="MyCousinLost" or defName="MyGrandparentLost" or defName="MyUncleLost" or defName="MyAuntLost" or defName="MyHalfSiblingLost" or defName="MyNephewLost" or defName="MyNieceLost"]</xpath>
 			<value>
 				<nullifyingPrecepts>
 					<li>SocialAffection_Psychopath</li>
@@ -14,7 +14,7 @@
 			</value>
 		</nomatch>
 		<match Class="PatchOperationAdd">
-			<xpath>Defs/ThoughtDef[defName="MyKinLost" or defName="MyCousinLost" or defName="MyGrandparentLost" or defName="MyUncleLost" or defName="MyAuntLost" or defName="MyHalfSiblingLost" or defName="MyNephewLost" or defName="MyNieceLost" or defName="MyHalfSiblingLost" or defName="MyHalfSiblingLost" or defName="MyHalfSiblingLost"]/nullifyingPrecepts</xpath>
+			<xpath>Defs/ThoughtDef[defName="MyKinLost" or defName="MyCousinLost" or defName="MyGrandparentLost" or defName="MyUncleLost" or defName="MyAuntLost" or defName="MyHalfSiblingLost" or defName="MyNephewLost" or defName="MyNieceLost"]/nullifyingPrecepts</xpath>
 			<value>
 				<li>SocialAffection_Psychopath</li>
 				<li>SocialAffection_Dry</li>
diff --git a/1.5/Patches/RJW_Thought_Family_Beast.xml b/1.5/Patches/RJW_Thought_Family_Beast.xml
index ba190c9..051eb58 100644
--- a/1.5/Patches/RJW_Thought_Family_Beast.xml
+++ b/1.5/Patches/RJW_Thought_Family_Beast.xml
@@ -709,7 +709,6 @@
 				<nullifyingPrecepts>
 					<li>SocialAffection_Psychopath</li>
 					<li>SocialAffection_Dry</li>
-					<li>SocialAffection_OnlyFamily</li>
 				</nullifyingPrecepts>
 			</value>
 		</nomatch>
@@ -718,7 +717,6 @@
 			<value>
 				<li>SocialAffection_Psychopath</li>
 				<li>SocialAffection_Dry</li>
-				<li>SocialAffection_OnlyFamily</li>
 			</value>
 		</match>
 	</Operation>