diff --git a/common/decisions/80_major_decisions_roman.txt b/common/decisions/80_major_decisions_roman.txt
index d866cb4d..40602f25 100644
--- a/common/decisions/80_major_decisions_roman.txt
+++ b/common/decisions/80_major_decisions_roman.txt
@@ -998,10 +998,10 @@ dismantle_papacy_decision = { #For Muslims and Pagans.
 	is_shown = {
 		is_ruler = yes
 		is_playable_character = yes
-		faith:catholic = {
+		faith:roman_catholic = {
 			has_doctrine = doctrine_spiritual_head
 		}
-		faith:catholic = {
+		faith:roman_catholic = {
 			faith_hostility_level = {
 				target = root.faith
 				value >= faith_hostile_level
diff --git a/common/flavorization/00_title_holders.txt b/common/flavorization/00_title_holders.txt
index 27dd16b3..8e45fe51 100644
--- a/common/flavorization/00_title_holders.txt
+++ b/common/flavorization/00_title_holders.txt
@@ -58,7 +58,7 @@ head_of_faith_pope = {
 		top_liege = no
 	}
 	governments = { theocracy_government }
-	faith = catholic
+	faith = roman_catholic
 }
 
 head_of_faith_female = {
diff --git a/common/scripted_effects/00_major_decisions_scripted_effects.txt b/common/scripted_effects/00_major_decisions_scripted_effects.txt
index 807afe86..0e3eaf2b 100644
--- a/common/scripted_effects/00_major_decisions_scripted_effects.txt
+++ b/common/scripted_effects/00_major_decisions_scripted_effects.txt
@@ -832,7 +832,7 @@ restore_papacy_scripted_effect = {
 		}
 	}
 	resolve_title_and_vassal_change = scope:change
-	faith:catholic = {
+	faith:roman_catholic = {
 		change_fervor = {
 			value = 15
 			desc = fervor_gain_papacy_restored
@@ -914,7 +914,7 @@ destroy_papacy_scripted_effect = {
 	}
 
 	# Catholicism is now sad.
-	faith:catholic = {
+	faith:roman_catholic = {
 		change_fervor = {
 			value = -100
 			desc = fervor_loss_papacy_destroyed
diff --git a/common/scripted_triggers/00_religious_triggers.txt b/common/scripted_triggers/00_religious_triggers.txt
index d4062715..88f0b7c2 100644
--- a/common/scripted_triggers/00_religious_triggers.txt
+++ b/common/scripted_triggers/00_religious_triggers.txt
@@ -65,35 +65,26 @@ is_christian_trigger = {
 not_non_catholic_standard_christian_faith_trigger = {
 	NOR = {
 		this = faith:orthodox
-		this = faith:iconoclast
-		this = faith:coptic
-		this = faith:armenian_apostolic
 	}
 }
 
 not_non_orthodox_standard_christian_faith_trigger = {
 	NOR = {
-		this = faith:catholic
-		this = faith:coptic
-		this = faith:armenian_apostolic
+		this = faith:roman_catholic
 	}
 }
 
 not_non_coptic_standard_christian_faith_trigger = {
 	NOR = {
-		this = faith:catholic
+		this = faith:roman_catholic
 		this = faith:orthodox
-		this = faith:iconoclast
-		this = faith:armenian_apostolic
 	}
 }
 
 not_non_armenian_standard_christian_faith_trigger = {
 	NOR = {
-		this = faith:catholic
+		this = faith:roman_catholic
 		this = faith:orthodox
-		this = faith:iconoclast
-		this = faith:coptic
 	}
 }
 
@@ -776,42 +767,42 @@ is_preferred_heresy = {
 		HERETICAL_FAITH = $HERETICAL_FAITH$
 	}
 
-	OR = {
-		#If we're Chistian, pick a heretical faiths which is in the same regional group as our origin faith (i.e., Lollards for Catholics, Iconoclasts for Orthodox, etc.)
-		AND = {
-			OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion }
-			OR = {
-				faiths_are_in_western_christianity_group = { FAITH_1 = $ORIGIN_FAITH$ FAITH_2 = $HERETICAL_FAITH$ }
-				faiths_are_in_orthodox_christianity_group = { FAITH_1 = $ORIGIN_FAITH$ FAITH_2 = $HERETICAL_FAITH$ }
-				faiths_are_in_eastern_christianity_group = { FAITH_1 = $ORIGIN_FAITH$ FAITH_2 = $HERETICAL_FAITH$ }
-			}
-		}
-
-		#If we're Muslim, we want to stay within our 'branch' of Islam:
-		AND = {
-			religion_tag = islam_religion
-			OR = {
-				faiths_are_in_sunni_islam_group = { FAITH_1 = $ORIGIN_FAITH$ FAITH_2 = $HERETICAL_FAITH$}
-				faiths_are_in_shia_islam_group = { FAITH_1 = $ORIGIN_FAITH$ FAITH_2 = $HERETICAL_FAITH$}
-				faiths_are_in_muhakkima_islam_group = { FAITH_1 = $ORIGIN_FAITH$ FAITH_2 = $HERETICAL_FAITH$}
-			}
-		}
-		#If we're Zoroastrian, we don't want Sogdian faith in Armenia and vice versa
-		AND = {
-			religion_tag = zoroastrianism_religion
-			OR = {
-				faiths_are_eastern_zoroastrian = { FAITH_1 = $ORIGIN_FAITH$ FAITH_2 = $HERETICAL_FAITH$}
-				faiths_are_western_zoroastrian = { FAITH_1 = $ORIGIN_FAITH$ FAITH_2 = $HERETICAL_FAITH$}
-			}
-		}
-
-		#Otherwise, we don't have any special preferences.
-		NOT = {
-			religion_tag = islam_religion
-			OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion }
-			religion_tag = zoroastrianism_religion
-		}
-	}
+#	OR = {
+#		#If we're Chistian, pick a heretical faiths which is in the same regional group as our origin faith (i.e., Lollards for Catholics, Iconoclasts for Orthodox, etc.)
+#		AND = {
+#			OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion }
+#			OR = {
+#				faiths_are_in_western_christianity_group = { FAITH_1 = $ORIGIN_FAITH$ FAITH_2 = $HERETICAL_FAITH$ }
+#				faiths_are_in_orthodox_christianity_group = { FAITH_1 = $ORIGIN_FAITH$ FAITH_2 = $HERETICAL_FAITH$ }
+#				faiths_are_in_eastern_christianity_group = { FAITH_1 = $ORIGIN_FAITH$ FAITH_2 = $HERETICAL_FAITH$ }
+#			}
+#		}
+#
+#		#If we're Muslim, we want to stay within our 'branch' of Islam:
+#		AND = {
+#			religion_tag = islam_religion
+#			OR = {
+#				faiths_are_in_sunni_islam_group = { FAITH_1 = $ORIGIN_FAITH$ FAITH_2 = $HERETICAL_FAITH$}
+#				faiths_are_in_shia_islam_group = { FAITH_1 = $ORIGIN_FAITH$ FAITH_2 = $HERETICAL_FAITH$}
+#				faiths_are_in_muhakkima_islam_group = { FAITH_1 = $ORIGIN_FAITH$ FAITH_2 = $HERETICAL_FAITH$}
+#			}
+#		}
+#		#If we're Zoroastrian, we don't want Sogdian faith in Armenia and vice versa
+#		AND = {
+#			religion_tag = zoroastrianism_religion
+#			OR = {
+#				faiths_are_eastern_zoroastrian = { FAITH_1 = $ORIGIN_FAITH$ FAITH_2 = $HERETICAL_FAITH$}
+#				faiths_are_western_zoroastrian = { FAITH_1 = $ORIGIN_FAITH$ FAITH_2 = $HERETICAL_FAITH$}
+#			}
+#		}
+#
+#		#Otherwise, we don't have any special preferences.
+#		NOT = {
+#			religion_tag = islam_religion
+#			OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion }
+#			religion_tag = zoroastrianism_religion
+#		}
+#	}
 }
 
 is_valid_heresy = {
@@ -828,48 +819,28 @@ is_valid_heresy = {
 	}
 	#Depending on the origin faith's religion/religion group, there may have additional requirements for a heresy to be considered valid.
 	OR = {
-		#For Christian Faiths, the origin and heretical faiths must not both be Ecumenical (excepting the faiths which aren't technically ecumenical).
-#		AND = {
-#			OR = { religion_tag = eastern_orthodox_religion religion_tag = catholic_religion religion_tag = protestant_religion }
-#			NAND = {
-#				$ORIGIN_FAITH$ = {
-#					has_doctrine = special_doctrine_ecumenical_christian
-#					OR = {
-#						this = faith:insular_celtic
-#						this = faith:bosnian_church
-#						this = faith:mozarabic_church
-#					}
-#				}
-#				$HERETICAL_FAITH$ = {
-#					has_doctrine = special_doctrine_ecumenical_christian
-#					OR = {
-#						this = faith:insular_celtic
-#						this = faith:bosnian_church
-#						this = faith:mozarabic_church
-#					}
-#				}
-#			}
-#		}
-		AND = { #FP3: for Zoroastrianism, Bedhin faiths are never heresies of each other
-			religion_tag = zoroastrianism_religion
+		#Roman rites are identical, just split for gameplay reasons until BGA
+		AND = {
+			religion_tag = catholic_religion
 			NAND = {
 				$ORIGIN_FAITH$ = {
-					has_doctrine = doctrine_major_branch_behdin
+					has_doctrine = special_doctrine_roman_rite
 				}
 				$HERETICAL_FAITH$ = {
-					has_doctrine = doctrine_major_branch_behdin
+					has_doctrine = special_doctrine_roman_rite
 				}
 			}
 		}
-		#No special requirements for Muslims, Jews, or Yazidis
+		religion_tag = eastern_orthodox_religion
+		religion_tag = protestant_religion
 		religion_tag = islam_religion
 		religion_tag = judaism_religion
 		#Eastern Faiths can shift and spread amongst each other.
 		OR = {
 			religion_tag = buddhism_religion
-			religion_tag = hinduism_religion
-			religion_tag = jainism_religion
-			religion_tag = dualism_religion
+#			religion_tag = hinduism_religion
+#			religion_tag = jainism_religion
+#			religion_tag = dualism_religion
 		}
 		#No special requirements for Pagan religions.
 		has_doctrine = pagan_hostility_doctrine
@@ -907,176 +878,137 @@ no_heretical_hof_faith_trigger = { #Head of Faith shouldn't convert.
 	}
 }
 
-#Christian Heresy Groups
-faiths_are_in_western_christianity_group = {
-	OR = {
-		$FAITH_1$ = faith:catholic
-		$FAITH_1$ = faith:cathar
-		$FAITH_1$ = faith:waldensian
-		$FAITH_1$ = faith:lollard
-		AND = {
-			$FAITH_1$ = faith:insular_celtic
-			scope:heretic_capital.title_province = { geographical_region = world_europe_west_britannia }
-		}
-		AND = {
-			$FAITH_1$ = faith:mozarabic_church
-			scope:heretic_capital.title_province = { geographical_region = world_europe_west_iberia }
-		}
-	}
-	OR = {
-		$FAITH_2$ = faith:catholic
-		$FAITH_2$ = faith:cathar
-		$FAITH_2$ = faith:waldensian
-		$FAITH_2$ = faith:lollard
-		$FAITH_2$ = faith:priscillianism
-		AND = {
-			$FAITH_2$ = faith:insular_celtic
-			scope:heretic_capital.title_province = { geographical_region = world_europe_west_britannia }
-		}
-		AND = {
-			$FAITH_2$ = faith:mozarabic_church
-			scope:heretic_capital.title_province = { geographical_region = world_europe_west_iberia }
-		}
-	}
-}
-
-faiths_are_in_orthodox_christianity_group = {
-	OR = {
-		$FAITH_1$ = faith:orthodox
-		$FAITH_1$ = faith:iconoclast
-		$FAITH_1$ = faith:bogomilist
-		$FAITH_1$ = faith:paulician
-		AND = {
-			$FAITH_1$ = faith:bosnian_church
-			scope:heretic_capital.title_province = { geographical_region = world_europe_south_east }
-		}
-	}
-	OR = {
-		$FAITH_2$ = faith:orthodox
-		$FAITH_2$ = faith:iconoclast
-		$FAITH_2$ = faith:bogomilist
-		$FAITH_2$ = faith:paulician
-		$FAITH_2$ = faith:bosnian_church
-		$FAITH_2$ = faith:cainitism
-		AND = {
-			$FAITH_1$ = faith:bosnian_church
-			scope:heretic_capital.title_province = { geographical_region = world_europe_south_east }
-		}
-	}
-}
-
-faiths_are_in_eastern_christianity_group = {
-	OR = {
-		$FAITH_1$ = faith:coptic
-		$FAITH_1$ = faith:armenian_apostolic
-		$FAITH_1$ = faith:nestorian
-		$FAITH_1$ = faith:messalian
-		$FAITH_1$ = faith:paulician
-	}
-	OR = {
-		$FAITH_2$ = faith:coptic
-		$FAITH_2$ = faith:armenian_apostolic
-		$FAITH_2$ = faith:nestorian
-		$FAITH_2$ = faith:messalian
-		$FAITH_2$ = faith:paulician
-		$FAITH_2$ = faith:mandeaism
-	}
-}
-
-faiths_are_shia_zandaqa_sub_group = {
-	OR = {
-		this = faith:quranist
-		this = faith:qarmatian
-		this = faith:ghulat
-		this = faith:alawite
-		this = faith:alevi
-		this = faith:druze
-	}
-}
-
-faiths_are_in_sunni_islam_group = {
-	$FAITH_1$ = {
-		has_doctrine = muhammad_succession_sunni_doctrine
-	}
-	$FAITH_2$ = {
-		OR = {
-			has_doctrine = muhammad_succession_sunni_doctrine
-			has_doctrine = muhammad_succession_muhakkima_doctrine
-			this = faith:sabianism
-			this = faith:manichean
-			this = faith:quranist
-		}
-	}
-}
-
-faiths_are_in_shia_islam_group = {
-	$FAITH_1$ = {
-		OR = {
-			has_doctrine = muhammad_succession_shia_doctrine
-			faiths_are_shia_zandaqa_sub_group = yes
-		}
-	}
-	$FAITH_2$ = {
-		OR = {
-			has_doctrine = muhammad_succession_shia_doctrine
-			has_doctrine = muhammad_succession_muhakkima_doctrine
-			faiths_are_shia_zandaqa_sub_group = yes
-			this = faith:valentinianism
-			this = faith:sabianism
-		}
-	}
-}
-
-faiths_are_in_muhakkima_islam_group = {
-	$FAITH_1$ = {
-		has_doctrine = muhammad_succession_muhakkima_doctrine
-	}
-	$FAITH_2$ = {
-		OR = {
-			has_doctrine = muhammad_succession_muhakkima_doctrine
-			this = faith:manichean
-			this = faith:valentinianism
-		}
-	}
-}
-
-faiths_are_eastern_zoroastrian = { #FP3 update - so that Armenian faith (Arewordik) don't appear as a heresy in Sogdia
-	OR = {
-		$FAITH_1$ = faith:mazdayasna
-		$FAITH_1$ = faith:khurmazta
-		$FAITH_1$ = faith:gayomarthianism
-		$FAITH_2$ = faith:zurvanism
-		$FAITH_2$ = faith:mazdakism
-		$FAITH_2$ = faith:khurramism
-	}
-	OR = {
-		$FAITH_1$ = faith:mazdayasna
-		$FAITH_1$ = faith:khurmazta
-		$FAITH_1$ = faith:gayomarthianism
-		$FAITH_2$ = faith:zurvanism
-		$FAITH_2$ = faith:mazdakism
-		$FAITH_2$ = faith:khurramism
-	}
-}
-
-faiths_are_western_zoroastrian = { #FP3 update - so that Sogdian faith (Khurmazta) don't appear as a heresy in Armenia
-	OR = {
-		$FAITH_1$ = faith:mazdayasna
-		$FAITH_1$ = faith:gayomarthianism
-		$FAITH_2$ = faith:zurvanism
-		$FAITH_2$ = faith:mazdakism
-		$FAITH_2$ = faith:khurramism
-		$FAITH_2$ = faith:urartuism
-	}
-	OR = {
-		$FAITH_1$ = faith:mazdayasna
-		$FAITH_1$ = faith:gayomarthianism
-		$FAITH_2$ = faith:zurvanism
-		$FAITH_2$ = faith:mazdakism
-		$FAITH_2$ = faith:khurramism
-		$FAITH_2$ = faith:urartuism
-	}
-}
+##Christian Heresy Groups
+#faiths_are_in_western_christianity_group = {
+#	OR = {
+#		$FAITH_1$.religion = religion:catholic_religion
+#	}
+#	OR = {
+#		$FAITH_2$.religion = religion:catholic_religion
+#	}
+#}
+#
+#faiths_are_in_orthodox_christianity_group = {
+#	OR = {
+#		$FAITH_1$.religion = religion:orthodox_religion
+#	}
+#	OR = {
+#		$FAITH_2$.religion = religion:orthodox_religion
+#	}
+#}
+#
+#faiths_are_in_eastern_christianity_group = {
+#	OR = {
+#		$FAITH_1$ = faith:coptic
+#		$FAITH_1$ = faith:armenian_apostolic
+#		$FAITH_1$ = faith:nestorian
+#		$FAITH_1$ = faith:messalian
+#		$FAITH_1$ = faith:paulician
+#	}
+#	OR = {
+#		$FAITH_2$ = faith:coptic
+#		$FAITH_2$ = faith:armenian_apostolic
+#		$FAITH_2$ = faith:nestorian
+#		$FAITH_2$ = faith:messalian
+#		$FAITH_2$ = faith:paulician
+#		$FAITH_2$ = faith:mandeaism
+#	}
+#}
+#
+#faiths_are_shia_zandaqa_sub_group = {
+#	OR = {
+#		this = faith:quranist
+#		this = faith:qarmatian
+#		this = faith:ghulat
+#		this = faith:alawite
+#		this = faith:alevi
+#		this = faith:druze
+#	}
+#}
+#
+#faiths_are_in_sunni_islam_group = {
+#	$FAITH_1$ = {
+#		has_doctrine = muhammad_succession_sunni_doctrine
+#	}
+#	$FAITH_2$ = {
+#		OR = {
+#			has_doctrine = muhammad_succession_sunni_doctrine
+#			has_doctrine = muhammad_succession_muhakkima_doctrine
+#			this = faith:sabianism
+#			this = faith:manichean
+#			this = faith:quranist
+#		}
+#	}
+#}
+#
+#faiths_are_in_shia_islam_group = {
+#	$FAITH_1$ = {
+#		OR = {
+#			has_doctrine = muhammad_succession_shia_doctrine
+#			faiths_are_shia_zandaqa_sub_group = yes
+#		}
+#	}
+#	$FAITH_2$ = {
+#		OR = {
+#			has_doctrine = muhammad_succession_shia_doctrine
+#			has_doctrine = muhammad_succession_muhakkima_doctrine
+#			faiths_are_shia_zandaqa_sub_group = yes
+#			this = faith:valentinianism
+#			this = faith:sabianism
+#		}
+#	}
+#}
+#
+#faiths_are_in_muhakkima_islam_group = {
+#	$FAITH_1$ = {
+#		has_doctrine = muhammad_succession_muhakkima_doctrine
+#	}
+#	$FAITH_2$ = {
+#		OR = {
+#			has_doctrine = muhammad_succession_muhakkima_doctrine
+#			this = faith:manichean
+#			this = faith:valentinianism
+#		}
+#	}
+#}
+#
+#faiths_are_eastern_zoroastrian = { #FP3 update - so that Armenian faith (Arewordik) don't appear as a heresy in Sogdia
+#	OR = {
+#		$FAITH_1$ = faith:mazdayasna
+#		$FAITH_1$ = faith:khurmazta
+#		$FAITH_1$ = faith:gayomarthianism
+#		$FAITH_2$ = faith:zurvanism
+#		$FAITH_2$ = faith:mazdakism
+#		$FAITH_2$ = faith:khurramism
+#	}
+#	OR = {
+#		$FAITH_1$ = faith:mazdayasna
+#		$FAITH_1$ = faith:khurmazta
+#		$FAITH_1$ = faith:gayomarthianism
+#		$FAITH_2$ = faith:zurvanism
+#		$FAITH_2$ = faith:mazdakism
+#		$FAITH_2$ = faith:khurramism
+#	}
+#}
+#
+#faiths_are_western_zoroastrian = { #FP3 update - so that Sogdian faith (Khurmazta) don't appear as a heresy in Armenia
+#	OR = {
+#		$FAITH_1$ = faith:mazdayasna
+#		$FAITH_1$ = faith:gayomarthianism
+#		$FAITH_2$ = faith:zurvanism
+#		$FAITH_2$ = faith:mazdakism
+#		$FAITH_2$ = faith:khurramism
+#		$FAITH_2$ = faith:urartuism
+#	}
+#	OR = {
+#		$FAITH_1$ = faith:mazdayasna
+#		$FAITH_1$ = faith:gayomarthianism
+#		$FAITH_2$ = faith:zurvanism
+#		$FAITH_2$ = faith:mazdakism
+#		$FAITH_2$ = faith:khurramism
+#		$FAITH_2$ = faith:urartuism
+#	}
+#}
 
 refusing_conversion_is_crime_trigger = {
 	faith = {
@@ -1164,11 +1096,17 @@ religion_has_angels_trigger = {
 		religion = religion:eastern_orthodox_religion
 		religion = religion:catholic_religion
 		religion = religion:protestant_religion
+		religion = religion:french_pantheon_religion
+		religion = religion:thelema_religion
 		religion = religion:islam_religion
 		religion = religion:zoroastrianism_religion
 		religion = religion:dualism_religion
 		religion = religion:judaism_religion
-		religion = religion:yazidi_religion
+#		religion = religion:yazidi_religion
+		faith = faith:orleaniste
+		faith = faith:aslanite
+		faith = faith:kozachina
+		faith = faith:romanofuturist
 	}
 }
 
diff --git a/events/religion_events/heresy_events.txt b/events/religion_events/heresy_events.txt
index 34b1edce..74124af0 100644
--- a/events/religion_events/heresy_events.txt
+++ b/events/religion_events/heresy_events.txt
@@ -69,7 +69,7 @@ heresy.0001 = {
 					has_game_rule = strict_regional_heresy
 					trigger_if = {
 						limit = {
-							faith = faith:catholic
+							faith = faith:roman_catholic
 						}
 						capital_county = {
 							title_province = {
@@ -135,52 +135,6 @@ heresy.0001 = {
 					}
 					add_to_list = potential_heresies
 				}
-				if = {
-					# Abrahamics also get bonus dualistic heresies
-					limit = {
-						is_in_family = rf_abrahamic
-					}
-					if = {
-						limit = {
-							this = religion:christianity_religion
-						}
-						faith:mandeaism = {
-							add_to_list = potential_heresies
-						}
-						faith:priscillianism = {
-							add_to_list = potential_heresies
-						}
-						faith:cainitism = {
-							add_to_list = potential_heresies
-						}
-
-					}
-					else_if = {
-						limit = {
-							this = religion:islam_religion
-						}
-						faith:manichean = {
-							add_to_list = potential_heresies
-						}
-						faith:sabianism = {
-							add_to_list = potential_heresies
-						}
-						faith:valentinianism = {
-							add_to_list = potential_heresies
-						}
-					}
-					else_if = {
-						limit = {
-							this = religion:judaism_religion
-						}
-						faith:conversos = {
-							add_to_list = potential_heresies
-						}
-						faith:sethianism = {
-							add_to_list = potential_heresies
-						}
-					}
-				}
 			}
 
 			#We want to pick certain faiths to be our heresy over others, assuming they are valid.
@@ -252,165 +206,7 @@ heresy.0001 = {
 						}
 						factor = 0
 					}
-
-					# Certain Faiths should be much more rare in general.
-					# Uncommon Faiths
-					modifier = {
-						factor = 0.5
-						OR = {
-							#Dualist
-							this = faith:mandeaism
-							this = faith:sabianism
-						}
-					}
-					#Rare Faiths
-					modifier = {
-						factor = 0.1
-						OR = {
-							this = faith:sethianism
-							this = faith:priscillianism
-							this = faith:cainitism
-						}
-					}
-
-					# Lollards more likely in England.
-					modifier = {
-						factor = regional_heresy_factor
-						this = faith:lollard
-						scope:heretic_capital = {
-							title_province = {
-								OR = {
-									geographical_region = custom_netherlands
-									geographical_region = world_europe_west_britannia
-								}
-							}
-						}
-					}
-					# Cathars more likely in France
-					modifier = {
-						factor = regional_heresy_factor
-						this = faith:cathar
-						scope:heretic_capital = {
-							title_province = {
-								geographical_region = world_europe_west_francia
-							}
-						}
-					}
-					# Waldensians more likely in Italy/South Germany
-					modifier = {
-						factor = regional_heresy_factor
-						this = faith:waldensian
-						scope:heretic_capital = {
-							title_province = {
-								OR = {
-									geographical_region = world_europe_south_italy
-									geographical_region = custom_germany
-									geographical_region = custom_bavaria
-								}
-							}
-						}
-					}
-
-					# Paulicians more likely in Anatolia
-					modifier = {
-						factor = regional_heresy_factor
-						this = faith:paulician
-						scope:heretic_capital = {
-							title_province = {
-								geographical_region = world_asia_minor
-							}
-						}
-					}
-					# Iconoclasts more likely in Constantinople
-					modifier = {
-						factor = regional_heresy_factor
-						this = faith:iconoclast
-						scope:heretic_capital = {
-							title_province = {
-								geographical_region = custom_k_thessalonika
-							}
-						}
-					}
-					# Bogomils more likely in West ERE
-					modifier = {
-						factor = regional_heresy_factor
-						this = faith:bogomilist
-						scope:heretic_capital = {
-							title_province = {
-								geographical_region = world_europe_south_east
-							}
-						}
-					}
-					# Nestorian more likely in the East
-					modifier = {
-						factor = regional_heresy_factor
-						this = faith:nestorian
-						scope:heretic_capital = {
-							title_province = {
-								OR = {
-									geographical_region = world_india
-									geographical_region = world_middle_east
-
-								}
-							}
-						}
-					}
-					# Priscillianism more likely in Egypt or Iberia
-					modifier = {
-						factor = regional_heresy_factor
-						this = faith:priscillianism
-						scope:heretic_capital = {
-							title_province = {						
-								OR = {
-									geographical_region = world_africa_north_east
-									geographical_region = world_europe_west_iberia
-								}
-							}
-						}
-					}
-
-					# FP3 - Khurramism more likely in Iran
-					modifier = {
-						factor = regional_heresy_factor
-						this = faith:khurramism
-						scope:heretic_capital = {
-							title_province = {						
-								geographical_region = world_middle_east_persia									
-							}
-						}
-					}
-					# FP3 - Behafaridism more likely in Iran
-					modifier = {
-						factor = regional_heresy_factor
-						this = faith:zurvanism #Behafaridism
-						scope:heretic_capital = {
-							title_province = {						
-								geographical_region = world_middle_east_persia
-							}
-						}
-					}
-					# FP3 - The "arch heresy", aka Mazdakism more likely in Iran
-					modifier = {
-						factor = regional_heresy_factor
-						this = faith:mazdakism
-						scope:heretic_capital = {
-							title_province = {						
-								geographical_region = world_middle_east_persia
-							}
-						}
-					}
-					# FP3 - Manicheanism more likely in Iran
-					modifier = {
-						factor = regional_heresy_factor
-						this = faith:manichean
-						scope:heretic_capital = {
-							title_province = {						
-								geographical_region = world_middle_east_persia
-							}
-						}
-					}
 				}
-
 				save_scope_as = heretic_faith
 			}
 
@@ -600,16 +396,7 @@ heresy.0005 = {
 			}
 
 			#Religions
-			faith:theravada.religion = { #Buddhism
-				add_to_list = eastern_religions
-			}
-			faith:manichean.religion = { #Hinduism
-				add_to_list = eastern_religions
-			}
-			faith:vaishnavism.religion = { #Jainism
-				add_to_list = eastern_religions
-			}
-			faith:digambara.religion = { #Dualism
+			faith:osvicenist.religion = { #Buddhism
 				add_to_list = eastern_religions
 			}
 
@@ -696,57 +483,6 @@ heresy.0005 = {
 
 					#Certain Faiths are much more likely to appear/spread than others, due to popularity/obscurity.
 					#Common Faiths
-					modifier = {
-						factor = 1
-						OR = {
-							#Buddhist
-							this = faith:theravada
-							this = faith:mahayana
-							this = faith:vajrayana
-
-							#Hindu
-							this = faith:vaishnavism
-							this = faith:smartism
-							this = faith:srikula_shaktism
-
-							#Jain
-							this = faith:digambara
-							this = faith:svetambara
-
-							#Dualist
-							this = faith:manichean
-						}
-					}
-
-					#Uncommon Faiths
-					modifier = {
-						factor = 0.5
-						OR = {
-							#Hindu
-							this = faith:advaitism
-							this = faith:krishnaism
-							this = faith:kalikula_shaktism
-
-							#Jain
-							this = faith:yapaniya
-
-							#Dualist
-							this = faith:mandeaism
-							this = faith:sabianism
-						}
-					}
-
-					#Rare Faiths
-					modifier = {
-						factor = 0.1
-						OR = {
-							#Dualist
-							this = faith:valentinianism
-							this = faith:sethianism
-							this = faith:priscillianism
-							this = faith:cainitism
-						}
-					}
 				}
 				save_scope_as = heretic_faith
 			}