diff --git a/common/scripted_effects/RG_scripted_effects.txt b/common/scripted_effects/RG_scripted_effects.txt
index 22767b3..fd33a74 100644
--- a/common/scripted_effects/RG_scripted_effects.txt
+++ b/common/scripted_effects/RG_scripted_effects.txt
@@ -101,13 +101,13 @@ rg_set_gray_portrait = {
 	#舰r/KDC
 	else_if = {
 		limit = {
-			OR = {
-				has_global_flag = has_wsg_mod
-				has_global_flag = kdc_event_mod_active
-			}
+			RG_OR_has_wsg_mod_trigger = yes
 			has_global_flag = rg_wg_gray_portrait_set
 		}
 		set_gray_portrait = yes
+		event_target:rg_gray_country_leader = {
+			set_gray_portrait = yes
+		}
 	}
 	#默认
 	else = {
@@ -185,34 +185,14 @@ rg_create_gray_species = {
 				exists = event_target:gray_species
 			}
 		}
-		if = {
-			limit = {
-				OR = {
-					has_global_flag = has_wsg_mod
-					has_global_flag = kdc_event_mod_active
-				}
-			}
-			create_species = {
-				name = GRAY_SPECIES
-				plural = GRAY_SPECIES
-				class = ART
-				portrait = GrayTempest06
-				namelist = ART1
-				effect = {
-					save_global_event_target_as = gray_species
-				}
-			}
-		}
-		else = {
-			create_species = {
-				name = GRAY_SPECIES
-				plural = GRAY_SPECIES
-				class = ART
-				portrait = @gray_portrait
-				namelist = ART1
-				effect = {
-					save_global_event_target_as = gray_species
-				}
+		create_species = {
+			name = GRAY_SPECIES
+			plural = GRAY_SPECIES
+			class = ART
+			portrait = @gray_portrait
+			namelist = ART1
+			effect = {
+				save_global_event_target_as = gray_species
 			}
 		}
 	}
diff --git a/events/RG_gray_goo_events.txt b/events/RG_gray_goo_events.txt
index b9bb251..571b2e8 100644
--- a/events/RG_gray_goo_events.txt
+++ b/events/RG_gray_goo_events.txt
@@ -449,10 +449,7 @@ country_event = {
 		# 舰r
 		name = rg_event.7.d
 		trigger = {
-			OR = {
-				has_global_flag = has_wsg_mod
-				has_global_flag = kdc_event_mod_active
-			}
+			RG_OR_has_wsg_mod_trigger = yes
 		}
 		hidden_effect = {
 			rg_global_clear_portrait_select = yes