rename core themes and include GA theme