diff --git a/common/buildings/elgar_buildings.txt b/common/buildings/elgar_buildings.txt
index 3d9d9b0d63..79a8cfa35f 100644
--- a/common/buildings/elgar_buildings.txt
+++ b/common/buildings/elgar_buildings.txt
@@ -100,4 +100,27 @@ building_tooling_workshops = {
 	required_construction = construction_cost_high
 	
 	ai_value = 2000 # Tools are very important
-}
\ No newline at end of file
+}
+
+
+building_arts_academy = {
+	building_group = bg_arts
+
+	city_type = city
+	
+	levels_per_mesh = 5
+
+	unlocking_technologies = {
+		romanticism
+	}
+
+	production_method_groups = {
+		pmg_base_building_arts_academy
+		pmg_ownership_building_arts_academy
+		pmg_arts_academy_focus
+	}
+	
+	texture = "gfx/interface/icons/building_icons/building_arts_academy.dds"
+
+	required_construction = construction_cost_medium
+}
diff --git a/common/customizable_localization/artists_customizable_localization.txt b/common/customizable_localization/artists_customizable_localization.txt
index d3594f112e..01c225fbe5 100644
--- a/common/customizable_localization/artists_customizable_localization.txt
+++ b/common/customizable_localization/artists_customizable_localization.txt
@@ -506,6 +506,12 @@ artists_artistic_progress_conservatory_tt_type = {
 	text = {
 		trigger = {
 			has_variable = artists_promote_composer_active_var
+			any_scope_state = {
+                is_production_method_active = {
+                    building_type = building_arts_academy
+                    production_method = pm_artists_arts_academy_conservatory
+                }
+            }
 		}
 		localization_key = artists_artistic_progress_conservatory_tt_loc
 	}
@@ -522,6 +528,12 @@ artists_artistic_progress_literary_salon_tt_type = {
 	text = {
 		trigger = {
 			has_variable = artists_promote_writer_active_var
+			any_scope_state = {
+                is_production_method_active = {
+                    building_type = building_arts_academy
+                    production_method = pm_artists_arts_academy_salon
+                }
+            }
 		}
 		localization_key = artists_artistic_progress_literary_salon_tt_loc
 	}
@@ -538,6 +550,12 @@ artists_artistic_progress_arts_studio_tt_type = {
 	text = {
 		trigger = {
 			has_variable = artists_promote_painter_active_var
+			any_scope_state = {
+                is_production_method_active = {
+                    building_type = building_arts_academy
+                    production_method = pm_artists_arts_academy_studio
+                }
+            }
 		}
 		localization_key = artists_artistic_progress_arts_studio_tt_loc
 	}
diff --git a/common/production_method_groups/elgar_production_method_groups.txt b/common/production_method_groups/elgar_production_method_groups.txt
index ba1e95b18f..f303f0ede1 100644
--- a/common/production_method_groups/elgar_production_method_groups.txt
+++ b/common/production_method_groups/elgar_production_method_groups.txt
@@ -69,9 +69,9 @@ pmg_arts_academy_focus = {
 	ai_selection = most_productive
 
 	production_methods = {
-		pm_dubois_arts_academy_standard
-		pm_dubois_arts_academy_conservatory
-		pm_dubois_arts_academy_salon
-		pm_dubois_arts_academy_studio
+		pm_artists_arts_academy_standard
+		pm_artists_arts_academy_conservatory
+		pm_artists_arts_academy_salon
+		pm_artists_arts_academy_studio
 	}
 }
\ No newline at end of file
diff --git a/common/production_methods/elgar_production_methods.txt b/common/production_methods/elgar_production_methods.txt
index 566cbf5d9c..15676b2bbe 100644
--- a/common/production_methods/elgar_production_methods.txt
+++ b/common/production_methods/elgar_production_methods.txt
@@ -380,24 +380,24 @@ pm_elgar_radio_stations = {
 
 #TODO change effects, etc.
 
-pm_dubois_arts_academy_standard = {
-	texture = "gfx/interface/icons/production_method_icons/dubois_university_standard_pm.dds"
+pm_artists_arts_academy_standard = {
+	texture = "gfx/interface/icons/production_method_icons/elgar_aa_no_specialization_pm.dds"
 	is_default = yes
 
 	unlocking_production_methods = {		
-		pm_dubois_arts_academy_standard
+		pm_artists_arts_academy_standard
     }
 }
 
-pm_dubois_arts_academy_conservatory = {
-	texture = "gfx/interface/icons/production_method_icons/elgar_conservatory_pm.dds"
+pm_artists_arts_academy_conservatory = {
+	texture = "gfx/interface/icons/production_method_icons/elgar_aa_conservatory_pm.dds"
 
 	unlocking_technologies = {
 		lepsius_antiquarianism_tech
 	}
 
 	unlocking_production_methods = {		
-		pm_dubois_arts_academy_standard
+		pm_artists_arts_academy_standard
     }
 
 	timed_modifiers = {
@@ -405,15 +405,15 @@ pm_dubois_arts_academy_conservatory = {
 	}
 }
 
-pm_dubois_arts_academy_salon = {
-	texture = "gfx/interface/icons/production_method_icons/dubois_university_natural_history_pm.dds"
+pm_artists_arts_academy_salon = {
+	texture = "gfx/interface/icons/production_method_icons/elgar_aa_literary_salon_pm.dds"
 
 	unlocking_technologies = {
 		dubois_theory_of_evolution_tech
 	}
 
 	unlocking_production_methods = {		
-		pm_dubois_arts_academy_standard
+		pm_artists_arts_academy_standard
     }
 
 	timed_modifiers = {
@@ -421,15 +421,15 @@ pm_dubois_arts_academy_salon = {
 	}
 }
 
-pm_dubois_arts_academy_studio = {
-	texture = "gfx/interface/icons/production_method_icons/dubois_university_natural_technology_pm.dds"
+pm_artists_arts_academy_studio = {
+	texture = "gfx/interface/icons/production_method_icons/elgar_aa_art_studio_pm.dds"
 
 	unlocking_technologies = {
 		atmospheric_engine
 	}
 
 	unlocking_production_methods = {		
-		pm_dubois_arts_academy_standard
+		pm_artists_arts_academy_standard
     }
 
 	timed_modifiers = {
diff --git a/common/scripted_effects/artists_scripted_effects.txt b/common/scripted_effects/artists_scripted_effects.txt
index fc796815a6..8db3c45b61 100644
--- a/common/scripted_effects/artists_scripted_effects.txt
+++ b/common/scripted_effects/artists_scripted_effects.txt
@@ -249,6 +249,12 @@ artists_monthly_artistic_progress_effect = {
 		if = { #Promoting Composer
 			limit = {
 				has_variable = artists_promote_composer_active_var
+				any_scope_state = {
+					is_production_method_active = {
+						building_type = building_arts_academy
+						production_method = pm_artists_arts_academy_conservatory
+					}
+				}
 			}
 			change_variable = {
 				name = artists_estimated_monthly_artistic_progress_var
@@ -258,6 +264,12 @@ artists_monthly_artistic_progress_effect = {
 		if = { #Promoting Writer
 			limit = {
 				has_variable = artists_promote_writer_active_var
+				any_scope_state = {
+					is_production_method_active = {
+						building_type = building_arts_academy
+						production_method = pm_artists_arts_academy_salon
+					}
+				}
 			}
 			change_variable = {
 				name = artists_estimated_monthly_artistic_progress_var
@@ -267,6 +279,12 @@ artists_monthly_artistic_progress_effect = {
 		if = { #Promoting Painter
 			limit = {
 				has_variable = artists_promote_painter_active_var
+				any_scope_state = {
+					is_production_method_active = {
+						building_type = building_arts_academy
+						production_method = pm_artists_arts_academy_studio
+					}
+				}
 			}
 			change_variable = {
 				name = artists_estimated_monthly_artistic_progress_var
@@ -535,6 +553,12 @@ artists_monthly_artistic_progress_GUI_effect = {
 		if = { #Promoting Composer
 			limit = {
 				has_variable = artists_promote_composer_active_var
+				any_scope_state = {
+					is_production_method_active = {
+						building_type = building_arts_academy
+						production_method = pm_artists_arts_academy_conservatory
+					}
+				}
 			}
 			change_variable = {
 				name = artists_estimated_monthly_artistic_progress_var
@@ -544,6 +568,12 @@ artists_monthly_artistic_progress_GUI_effect = {
 		if = { #Promoting Writer
 			limit = {
 				has_variable = artists_promote_writer_active_var
+				any_scope_state = {
+					is_production_method_active = {
+						building_type = building_arts_academy
+						production_method = pm_artists_arts_academy_salon
+					}
+				}
 			}
 			change_variable = {
 				name = artists_estimated_monthly_artistic_progress_var
@@ -553,6 +583,12 @@ artists_monthly_artistic_progress_GUI_effect = {
 		if = { #Promoting Painter
 			limit = {
 				has_variable = artists_promote_painter_active_var
+				any_scope_state = {
+					is_production_method_active = {
+						building_type = building_arts_academy
+						production_method = pm_artists_arts_academy_studio
+					}
+				}
 			}
 			change_variable = {
 				name = artists_estimated_monthly_artistic_progress_var
diff --git a/common/scripted_guis/MR_promote_sguis.txt b/common/scripted_guis/MR_promote_sguis.txt
index 0f4c727df0..536f9e8a3f 100644
--- a/common/scripted_guis/MR_promote_sguis.txt
+++ b/common/scripted_guis/MR_promote_sguis.txt
@@ -235,7 +235,7 @@ mr_artists_promote_composer_sgui = {
             any_scope_state = {
                 is_production_method_active = {
                     building_type = building_arts_academy
-                #    production_method = pm_dubois_university_mathematics #TODO add right PM
+                    production_method = pm_artists_arts_academy_conservatory
                 }
             }
         }
@@ -269,7 +269,7 @@ mr_artists_promote_writer_sgui = {
             any_scope_state = {
                 is_production_method_active = {
                     building_type = building_arts_academy
-                #    production_method = pm_dubois_university_mathematics #TODO add right PM
+                    production_method = pm_artists_arts_academy_salon
                 }
             }
         }
@@ -303,7 +303,7 @@ mr_artists_promote_painter_sgui = {
             any_scope_state = {
                 is_production_method_active = {
                     building_type = building_arts_academy
-                #    production_method = pm_dubois_university_mathematics #TODO add right PM
+                    production_method = pm_artists_arts_academy_studio
                 }
             }
         }