diff --git a/CleanSlate/common/cb_types/other_cbs.txt b/CleanSlate/common/cb_types/other_cbs.txt
index d417ed50..27c25b35 100644
--- a/CleanSlate/common/cb_types/other_cbs.txt
+++ b/CleanSlate/common/cb_types/other_cbs.txt
@@ -320,52 +320,61 @@ great_realm_conflict = {
 		# The attacker needs at least one county in the target kingdom, a border or be at the most two sea zones away
 		any_direct_de_jure_vassal_title = { # duchies
 			any_direct_de_jure_vassal_title = { # counties
-				OR = {
-					holder_scope = {
-						OR = {
-							character = ROOT
-							is_vassal_or_below_of = ROOT
+				trigger_if = {
+					limit = {
+						holder_scope = {
+							NOR = { # part of attacker's realm
+								character = ROOT
+								is_vassal_or_below_of = ROOT
+							}
 						}
 					}
+				}
+
+				holder_scope = {
+					OR = { # Actually part of Defender's realm, not a random title in the same de jure duchy
+						character = FROM
+						is_vassal_or_below_of = FROM
+					}
+				}
 
-					location = {
-						any_neighbor_province = {
-							trigger_if = {
-								limit = { has_owner = yes } # border county
+				location = {
+					any_neighbor_province = { # bordering province
+						trigger_if = {
+							limit = { has_owner = yes }
 
-								owner = {
-									OR = {
-										character = ROOT
-										is_vassal_or_below_of = ROOT
-									}
+							owner = { # part of attacker's realm
+								OR = {
+									character = ROOT
+									is_vassal_or_below_of = ROOT
 								}
 							}
-							trigger_else = {
-								is_land = no # first sea zone
+						}
+						trigger_else = {
+							is_land = no # first sea zone
 
-								any_neighbor_province = {
-									trigger_if = {
-										limit = { has_owner = yes }
+							any_neighbor_province = {
+								trigger_if = {
+									limit = { has_owner = yes }
+
+									owner = { # part of attacker's realm
+										OR = {
+											character = ROOT
+											is_vassal_or_below_of = ROOT
+										}
+									}
+								}
+								trigger_else = {
+									is_land = no # second sea zone
 
-										owner = {
+									any_neighbor_province = {
+										owner = { # part of attacker's realm
 											OR = {
 												character = ROOT
 												is_vassal_or_below_of = ROOT
 											}
 										}
 									}
-									trigger_else = {
-										is_land = no # second sea zone
-
-										any_neighbor_province = {
-											owner = {
-												OR = {
-													character = ROOT
-													is_vassal_or_below_of = ROOT
-												}
-											}
-										}
-									}
 								}
 							}
 						}
diff --git a/CleanSlate/common/cb_types/pagan_cbs.txt b/CleanSlate/common/cb_types/pagan_cbs.txt
index 6dad3b00..8caaa93b 100644
--- a/CleanSlate/common/cb_types/pagan_cbs.txt
+++ b/CleanSlate/common/cb_types/pagan_cbs.txt
@@ -693,369 +693,7 @@ pagan_subjugation = {
 	}
 }
 
-pagan_holy_war = {
-	name = CB_NAME_RELIGIOUS
-	war_name = WAR_NAME_RELIGIOUS
-	sprite = 9
-	truce_days = 1825
-	sort_priority = 800
-
-	is_permanent = yes
-	is_holy_war = yes
-	check_de_jure_tier = DUKE # this scans all dejure duchies for the counties which are held by or vassals(or below) of selected character. Only valid if is_permanent = yes
-	allowed_to_target_tributaries = no
-
-	can_use_gui = {
-		# Attacker
-		ROOT = {
-			piety >= 100
-		}
-	}
-
-	can_use = {
-		# Attacker
-		ROOT = {
-			religion_group = pagan_group
-
-			trigger_if = {
-				limit = { is_reformed_religion = no }
-				religion = aztec_pagan
-			}
-
-			religion = top_liege
-
-			NOR = {
-				religion = FROM
-				same_realm = FROM
-				has_religion_feature = religion_peaceful
-			}
-
-			mercenary = no
-		}
-	}
-
-	can_use_title = {
-		# The attacker needs at least one county in the target kingdom, or a border, or be only two sea zones away from one of your counties
-		any_direct_de_jure_vassal_title = {
-			OR = {
-				holder_scope = { # part of attacker's realm
-					OR = {
-						character = ROOT
-						is_vassal_or_below_of = ROOT
-					}
-				}
-
-				location = {
-					any_neighbor_province = { # bordering province
-						trigger_if = {
-							limit = { has_owner = yes }
-
-							owner = { # part of attacker's realm
-								OR = {
-									character = ROOT
-									is_vassal_or_below_of = ROOT
-								}
-							}
-						}
-						trigger_else = {
-							is_land = no # first sea zone
-
-							any_neighbor_province = {
-								trigger_if = {
-									limit = { has_owner = yes }
-
-									owner = { # part of attacker's realm
-										OR = {
-											character = ROOT
-											is_vassal_or_below_of = ROOT
-										}
-									}
-								}
-								trigger_else = {
-									is_land = no # second sea zone
-
-									any_neighbor_province = {
-										owner = { # part of attacker's realm
-											OR = {
-												character = ROOT
-												is_vassal_or_below_of = ROOT
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
-	is_valid = {
-		# Attacker
-		ROOT = {
-			is_reformed_religion = yes
-
-			NOR = {
-				same_realm = FROM
-				religion = FROM
-				top_liege = { religion = FROM }
-			}
-		}
-	}
-
-	on_add = {
-		attacker = {
-			show_scope_change = no
-			piety = -100
-		}
-
-		fire_haruspicy_event_effect = yes
-		anger_china_effect = yes
-	}
-
-	on_success = {
-		attacker = {
-			show_scope_change = no
-
-			participation_scaled_piety = 100
-			participation_scaled_prestige = 50
-
-			religion_authority = {
-				name = won_holy_war
-				years = 20
-			}
-
-			hidden_effect = {
-				if = {
-					limit = { has_ambition = obj_strengthen_religion }
-
-					change_variable = {
-						which = strengthen_religion
-						value = 1
-					}
-				}
-
-				if = {
-					limit = {
-						trigger_if = {
-							limit = { has_nickname = yes }
-							this_has_lame_nickname_trigger = yes
-						}
-					}
-
-					random_list = {
-						10 = { give_nickname = nick_the_dragon }
-						10 = { give_nickname = nick_the_holy }
-						10 = { give_nickname = nick_bloodaxe }
-						10 = { give_nickname = nick_the_great }
-						40 = { give_nickname = nick_the_sword_of_god }
-					}
-				}
-			}
-		}
-
-		any_attacker = {
-			limit = { NOT = { character = attacker } }
-
-			hidden_effect = {
-				participation_scaled_piety = 100
-				participation_scaled_prestige = 50
-
-				if = {
-					limit = { has_ambition = obj_strengthen_religion }
-
-					change_variable = {
-						which = strengthen_religion
-						value = 1
-					}
-				}
-			}
-		}
-
-		defender = {
-			show_scope_change = no
-
-			prestige = -50
-			piety = -100
-
-			religion_authority = {
-				name = lost_holy_war
-				years = 20
-			}
-		}
-	}
-
-	on_success_title = {
-		custom_tooltip = {
-			text = religious_cb_succ_tip
-
-			attacker = {
-				vassalize_or_take_under_title = {
-					title = PREV
-					enemy = defender
-					same_religion = yes # Only vassalize rulers of my religion
-					is_religious = yes
-					type = holy_war
-				}
-			}
-		}
-	}
-
-	on_fail = {
-		attacker = {
-			show_scope_change = no
-
-			piety = -50
-			prestige = -100
-		}
-	}
-
-	on_reverse_demand = {
-		attacker = {
-			show_scope_change = no
-
-			transfer_scaled_wealth = {
-				to = defender
-				value = 4.0
-			}
-
-			religion_authority = {
-				name = lost_holy_war
-				years = 20
-			}
-		}
-
-		defender = {
-			show_scope_change = no
-
-			participation_scaled_piety = 200
-			participation_scaled_prestige = 100
-
-			religion_authority = {
-				name = won_holy_war
-				years = 20
-			}
-
-			hidden_effect = {
-				if = {
-					limit = { has_ambition = obj_strengthen_religion }
-
-					change_variable = {
-						which = strengthen_religion
-						value = 1
-					}
-				}
-			}
-		}
-
-		any_defender = {
-			limit = { NOT = { character = defender } }
-
-			hidden_effect = {
-				participation_scaled_piety = 200
-				participation_scaled_prestige = 100
-
-				if = {
-					limit = { has_ambition = obj_strengthen_religion }
-
-					change_variable = {
-						which = strengthen_religion
-						value = 1
-					}
-				}
-			}
-		}
-	}
-
-	attacker_ai_victory_worth = {
-		factor = -1 # always accept
-	}
-
-	attacker_ai_defeat_worth = {
-		factor = 100
-	}
-
-	defender_ai_victory_worth = {
-		factor = -1 # always accept
-	}
-
-	defender_ai_defeat_worth = {
-		factor = 100
-	}
-
-	ai_will_do = {
-		factor = 0.9 # Prefer using CB's without on_add costs
-
-		trigger = {
-			trigger_if = {
-				limit = {
-					ROOT = {
-						is_tribal = yes
-					}
-
-					FROM = {
-						is_nomadic = yes
-					}
-				}
-
-				any_direct_de_jure_vassal_title = {
-					any_direct_de_jure_vassal_title = {
-						OR = {
-							holding_type = castle
-							holding_type = city
-							holding_type = tribal
-						}
-					}
-				}
-			}
-			trigger_else_if = {
-				limit = {
-					ROOT = {
-						is_nomadic = no
-						is_tribal = no
-					}
-
-					FROM = {
-						is_nomadic = yes
-					}
-
-				}
-
-				any_direct_de_jure_vassal_title = {
-					any_direct_de_jure_vassal_title = {
-						OR = {
-							holding_type = castle
-							holding_type = city
-						}
-					}
-				}
-			}
-		}
-
-		mult_modifier = {
-			factor = 0.1
-
-			ROOT = {
-				culture = hungarian
-
-				primary_title = {
-					OR = {
-						title = k_hungary
-						title = e_carpathia
-					}
-				}
-			}
-
-			empire = {
-				OR = {
-					title = e_tartaria
-					title = e_rus
-				}
-			}
-		}
-	}
-}
+# pagan_holy_war removed and combined with standard holy war
 
 # The Prepared Invasion CB of Norse Heathens
 viking_invasion = {
diff --git a/CleanSlate/common/cb_types/religious_cbs.txt b/CleanSlate/common/cb_types/religious_cbs.txt
index 59025610..81febfdd 100644
--- a/CleanSlate/common/cb_types/religious_cbs.txt
+++ b/CleanSlate/common/cb_types/religious_cbs.txt
@@ -2159,53 +2159,32 @@ religious = {
 	can_use_gui = {
 		# Attacker
 		ROOT = {
-			trigger_if = {
-				limit = { religion = buddhist }
-				piety >= 250
-			}
-		}
-	}
-
-	can_use = {
-		# Attacker
-		ROOT = {
-			# General requirements
+			# General Requirements
 			is_nomadic = no
 			pacifist = no
 			mercenary = no
+			NOT = { same_realm = FROM }
 
-			NOR = {
-				religion_group = pagan_group
-				religion = taoist
-				same_realm = FROM
-			}
-
-			# Northern Crusade
 			trigger_if = {
-				limit = { has_global_flag = northern_crusades_active }
+				limit = { religion_group = indian_group }
 
-				NOR = {
-					has_landed_title = k_teutonic_state
-					has_landed_title = d_teutonic_order
+				NOT = { religion = taoist }
+				trigger_if = {
+					limit = { religion = buddhist }
+					piety >= 250
 				}
 			}
+			trigger_else_if = {
+				limit = { religion_group = pagan_group }
+				piety >= 100
 
-			# Reconquista check
-			reconquista_check_trigger = no
-			NOT = { has_character_flag = currently_reconquering_iberia }
-
-			# Hindu check
-			trigger_if = {
-				limit = {
-					religion = hindu
-					FROM = { has_dharmic_religion_trigger = yes }
+				OR = {
+					is_reformed_religion = yes
+					religion = aztec_pagan
 				}
-
-				FROM = { has_character_modifier = known_satanist }
-				NOT = { has_character_modifier = known_satanist }
 			}
 
-			# Requirements for holy war in same religion group
+			# Requirements for Holy War in the same religion group
 			trigger_if = {
 				limit = { religion_group = FROM }
 
@@ -2214,9 +2193,20 @@ religious = {
 					is_heresy_of = FROM
 					is_parent_religion = FROM
 
+					# Can holy war known demon worshippers in he same religion group
+					trigger_if = {
+						limit = {
+							NOT = { has_character_modifier = known_satanist }
+						}
+						FROM = { has_character_modifier = known_satanist }
+					}
+
 					# Dharmics can fight Taoists
 					trigger_if = {
-						limit = { has_dharmic_religion_trigger = yes }
+						limit = {
+							religion_group = indian_group # Not strictly necessary, but I like the consistency
+							has_dharmic_religion_trigger = yes
+						}
 						FROM = { religion = taoist }
 					}
 
@@ -2233,36 +2223,57 @@ religious = {
 						}
 					}
 
-					# Can holy war known demon worshippers in he same religion group
-					trigger_if = {
-						limit = { FROM = { has_character_modifier = known_satanist } }
-						NOT = { has_character_modifier = known_satanist }
+					# Pagans also fight amongst themselves
+					trigger_else_if = {
+						limit = { religion_group = pagan }
+						NOT = { religion = FROM }
 					}
 				}
 			}
 
-			top_liege = {
-				religion_group = ROOT
+			# Northern Crusade
+			trigger_if = {
+				limit = { has_global_flag = northern_crusades_active }
 
-				# Can holy war known devil worshippers of top liege's religion
-				trigger_if = {
-					limit = { religion = FROM }
+				NOR = {
+					has_landed_title = k_teutonic_state
+					has_landed_title = d_teutonic_order
+				}
+			}
 
-					FROM = { has_character_modifier = known_satanist }
-					NOT = { has_character_modifier = known_satanist }
+			# Reconquista check
+			reconquista_check_trigger = no
+			NOT = { has_character_flag = currently_reconquering_iberia }
 
-					ROOT = {
-						NOT = { has_character_modifier = known_satanist }
+			trigger_if = {
+				limit = { independent = no }
+
+				top_liege = {
+					religion_group = ROOT
+
+					# Religion must match, or neither is a heretic
+					trigger_if = {
+						limit = {
+							NOT = { religion = ROOT }
+						}
+
+						NOR = {
+							religion_group = pagan_group
+							is_heretic = yes
+							ROOT = { is_heretic = yes }
+						}
 					}
-				}
 
-				# Religion must match, or neither is a heretic
-				OR = {
-					religion = ROOT
+					# Can holy war known devil worshippers of top liege's religion
+					trigger_if = {
+						limit = { religion = FROM }
 
-					AND = {
-						is_heretic = no
-						ROOT = { is_heretic = no }
+						FROM = { has_character_modifier = known_satanist }
+						NOT = { has_character_modifier = known_satanist }
+
+						ROOT = {
+							NOT = { has_character_modifier = known_satanist }
+						}
 					}
 				}
 			}
@@ -2272,72 +2283,79 @@ religious = {
 	can_use_title = {
 		# The attacker needs at least one county in the target duchy, or a border, or be only two sea zones away from one of your counties
 		any_direct_de_jure_vassal_title = {
-			OR = {
-				holder_scope = { # attacker owns a county in target duchy
-					OR = {
-						character = ROOT
-						is_vassal_or_below_of = ROOT
+			trigger_if = {
+				limit = {
+					holder_scope = {
+						NOR = { # part of attacker's realm
+							character = ROOT
+							is_vassal_or_below_of = ROOT
+						}
 					}
 				}
 
-				location = {
-					any_neighbor_province = {
-						trigger_if = {
-							limit = { has_owner = yes } # not wasteland or sea zone
+				holder_scope = {
+					OR = { # Actually part of Defender's realm, not a random title in the same de jure duchy
+						character = FROM
+						is_vassal_or_below_of = FROM
+					}
+				}
+			}
 
-							owner = {
-								OR = {
-									character = ROOT
-									is_vassal_or_below_of = ROOT
-								}
+			location = {
+				any_neighbor_province = { # bordering province
+					trigger_if = {
+						limit = { has_owner = yes }
+
+						owner = { # part of attacker's realm
+							OR = {
+								character = ROOT
+								is_vassal_or_below_of = ROOT
 							}
 						}
+					}
+					trigger_else = {
+						is_land = no # first sea zone
 
-						trigger_else = {
-							is_land = no # first sea zone
+						OR = { # religion requirements for attack across sea zones
+							ROOT = { religion_group = muslim }
+							FROM = { religion_group = muslim }
 
-							OR = { # religion requirements for attack across sea zones
+							trigger_if = {
+								limit = { ROOT = { religion_group = pagan_group } }
+								has_global_flag = pagan_ghws_unlocked
+							}
+							trigger_else_if = {
+								limit = { ROOT = { religion_group = christian } }
+								has_global_flag = christian_crusades_unlocked
+							}
+							trigger_else = {
 								ROOT = { religion_group = muslim }
-								FROM = { religion_group = muslim }
+								has_global_flag = muslim_jihads_unlocked
+							}
+						}
 
-								trigger_if = {
-									limit = { ROOT = { religion_group = pagan_group } }
-									has_global_flag = pagan_ghws_unlocked
-								}
-								trigger_else_if = {
-									limit = { ROOT = { religion_group = christian } }
-									has_global_flag = christian_crusades_unlocked
-								}
-								trigger_else = {
-									ROOT = { religion_group = muslim }
-									has_global_flag = muslim_jihads_unlocked
+						any_neighbor_province = {
+							trigger_if = {
+								limit = { has_owner = yes }
+
+								owner = { # part of attacker's realm
+									OR = {
+										character = ROOT
+										is_vassal_or_below_of = ROOT
+									}
 								}
 							}
+							trigger_else = {
+								is_land = no # second sea zone
 
-							any_neighbor_province = { # county one sea zone away
-								trigger_if = {
-									limit = { has_owner = yes } # not wasteland or sea zone
-
-									owner = {
+								any_neighbor_province = {
+									owner = { # part of attacker's realm
 										OR = {
 											character = ROOT
 											is_vassal_or_below_of = ROOT
 										}
 									}
 								}
-
-								trigger_else = {
-									is_land = no # second seazone
-
-									any_neighbor_province = { # county two sea zones away
-										owner = {
-											OR = {
-												character = ROOT
-												is_vassal_or_below_of = ROOT
-											}
-										}
-									}
-								}
 							}
 						}
 					}
@@ -2349,9 +2367,15 @@ religious = {
 	is_valid = {
 		# Attacker
 		ROOT = {
-			NOR = {
-				religion_group = pagan_group
-				same_realm = FROM
+			NOT = { same_realm = FROM }
+
+			trigger_if = {
+				limit = { religion_group = pagan_group }
+
+				OR = {
+					is_reformed_religion = yes
+					religion = aztec_pagan
+				}
 			}
 
 			pacifist = no
@@ -2407,6 +2431,10 @@ religious = {
 				limit = { religion = buddhist }
 				piety = -250
 			}
+			else_if = {
+				limit = { religion_group = pagan_group }
+				piety = -100
+			}
 		}
 
 		fire_haruspicy_event_effect = yes
@@ -2439,6 +2467,24 @@ religious = {
 						value = 1
 					}
 				}
+
+				if = {
+					limit = {
+						religion_group = pagan_group # Originally only in pagan_holy_war
+						trigger_if = {
+							limit = { has_nickname = yes }
+							this_has_lame_nickname_trigger = yes
+						}
+					}
+
+					random_list = {
+						10 = { give_nickname = nick_the_dragon }
+						10 = { give_nickname = nick_the_holy }
+						10 = { give_nickname = nick_bloodaxe }
+						10 = { give_nickname = nick_the_great }
+						40 = { give_nickname = nick_the_sword_of_god }
+					}
+				}
 			}
 		}
 
@@ -2694,6 +2740,12 @@ religious = {
 
 		coronation_factor = yes
 
+		mult_factor = { # Prefer using CB's without on_add costs
+			factor = 0.9
+
+			attacker = { religion_group = pagan_group }
+		}
+
 		# Try to guide the Hordes in the right direction
 		mult_modifier = {
 			factor = 0.1
@@ -2773,6 +2825,28 @@ religious = {
 				}
 			}
 		}
+
+		mult_modifier = {
+			factor = 0.1
+
+			ROOT = {
+				culture = hungarian
+
+				primary_title = {
+					OR = {
+						title = k_hungary
+						title = e_carpathia
+					}
+				}
+			}
+
+			empire = {
+				OR = {
+					title = e_tartaria
+					title = e_rus
+				}
+			}
+		}
 	}
 }
 
@@ -2846,70 +2920,62 @@ liberate_religion = {
 		}
 
 		# The attacker needs at least one county in the target kingdom, or a border, or be only two sea zones away from one of your counties
-		any_de_jure_vassal_title = {
-			OR = {
-				holder_scope = { # own a county
-					OR = {
-						character = ROOT
-						is_vassal_or_below_of = ROOT
+		any_direct_de_jure_vassal_title = {
+			trigger_if = {
+				limit = {
+					holder_scope = {
+						NOR = { # part of attacker's realm
+							character = ROOT
+							is_vassal_or_below_of = ROOT
+						}
 					}
 				}
+			}
+
+			holder_scope = {
+				OR = { # Actually part of Defender's realm, not a random title in the same de jure duchy
+					character = FROM
+					is_vassal_or_below_of = FROM
+				}
+			}
 
-				location = {
-					any_neighbor_province = { # have a border
-						trigger_if = {
-							limit = { has_owner = yes }
+			location = {
+				any_neighbor_province = { # bordering province
+					trigger_if = {
+						limit = { has_owner = yes }
 
-							owner = {
-								OR = {
-									character = ROOT
-									is_vassal_or_below_of = ROOT
-								}
+						owner = { # part of attacker's realm
+							OR = {
+								character = ROOT
+								is_vassal_or_below_of = ROOT
 							}
 						}
-						trigger_else = {
-							is_land = no # first sea zone
+					}
+					trigger_else = {
+						is_land = no # first sea zone
 
-							OR = {
-								FROM = { religion_group = muslim }
+						any_neighbor_province = {
+							trigger_if = {
+								limit = { has_owner = yes }
 
-								trigger_if = {
-									limit = { ROOT = { religion_group = pagan_group } }
-									has_global_flag = pagan_ghws_unlocked
-								}
-								trigger_else_if = {
-									limit = { ROOT = { religion_group = christian } }
-									has_global_flag = christian_crusades_unlocked
-								}
-								trigger_else = {
-									ROOT = { religion_group = muslim }
-									has_global_flag = muslim_jihads_unlocked
+								owner = { # part of attacker's realm
+									OR = {
+										character = ROOT
+										is_vassal_or_below_of = ROOT
+									}
 								}
 							}
+							trigger_else = {
+								is_land = no # second sea zone
 
-							any_neighbor_province = {
-								trigger_if = {
-									limit = { has_owner = yes }
-
-									owner = {
+								any_neighbor_province = {
+									owner = { # part of attacker's realm
 										OR = {
 											character = ROOT
 											is_vassal_or_below_of = ROOT
 										}
 									}
 								}
-								trigger_else = {
-									is_land = no # second sea zone
-
-									any_neighbor_province = {
-										owner = {
-											OR = {
-												character = ROOT
-												is_vassal_or_below_of = ROOT
-											}
-										}
-									}
-								}
 							}
 						}
 					}
diff --git a/CleanSlate/decisions/HF_baptism_decisions.txt b/CleanSlate/decisions/HF_baptism_decisions.txt
index 2accf73e..c4c44896 100644
--- a/CleanSlate/decisions/HF_baptism_decisions.txt
+++ b/CleanSlate/decisions/HF_baptism_decisions.txt
@@ -1742,7 +1742,6 @@ decisions = {
 							using_cb = religious
 							using_cb = muslim_invasion
 							using_cb = buddhist_holy_war
-							using_cb = pagan_holy_war
 						}
 
 						war_score >= 50
@@ -1781,7 +1780,6 @@ decisions = {
 						using_cb = religious
 						using_cb = muslim_invasion
 						using_cb = buddhist_holy_war
-						using_cb = pagan_holy_war
 					}
 
 					war_score >= -50
diff --git a/CleanSlate/decisions/conversion_decisions.txt b/CleanSlate/decisions/conversion_decisions.txt
index d6ecbf80..e2be7e27 100644
--- a/CleanSlate/decisions/conversion_decisions.txt
+++ b/CleanSlate/decisions/conversion_decisions.txt
@@ -2978,7 +2978,6 @@ decisions = {
 					using_cb = religious
 					using_cb = muslim_invasion
 					using_cb = buddhist_holy_war
-					using_cb = pagan_holy_war
 				}
 
 				trigger_if = {
@@ -3019,7 +3018,6 @@ decisions = {
 							using_cb = religious
 							using_cb = muslim_invasion
 							using_cb = buddhist_holy_war
-							using_cb = pagan_holy_war
 						}
 
 						trigger_if = {
@@ -3216,7 +3214,6 @@ decisions = {
 						using_cb = religious
 						using_cb = muslim_invasion
 						using_cb = buddhist_holy_war
-						using_cb = pagan_holy_war
 					}
 
 					war_score >= 75
diff --git a/CleanSlate/events/base_job_lord_spiritual.txt b/CleanSlate/events/base_job_lord_spiritual.txt
index 710e394e..75d37f1c 100644
--- a/CleanSlate/events/base_job_lord_spiritual.txt
+++ b/CleanSlate/events/base_job_lord_spiritual.txt
@@ -2801,7 +2801,6 @@ character_event = {
 						using_cb = new_crusade
 						using_cb = religious
 						using_cb = religious_revolt
-						using_cb = pagan_holy_war
 						using_cb = buddhist_holy_war
 						using_cb = muslim_invasion
 						using_cb = manifest_destiny_invasion
diff --git a/CleanSlate/events/base_religious_events.txt b/CleanSlate/events/base_religious_events.txt
index b55ee01f..809cd702 100644
--- a/CleanSlate/events/base_religious_events.txt
+++ b/CleanSlate/events/base_religious_events.txt
@@ -3933,10 +3933,11 @@ character_event = {
 				factor = 0.1
 
 				any_war = {
-					using_cb = pagan_holy_war
+					using_cb = religious
 
 					attacker = {
 						character = ROOT
+						religion_group = pagan_group
 					}
 				}
 			}
@@ -4448,10 +4449,11 @@ character_event = {
 				factor = 0.1
 
 				any_war = {
-					using_cb = pagan_holy_war
+					using_cb = religious
 
 					attacker = {
 						character = ROOT
+						religion_group = pagan_group
 					}
 				}
 			}