diff --git a/config/AGKY2019.xml b/config/AGKY2019.xml
index f09c6dcee..157501a17 100644
--- a/config/AGKY2019.xml
+++ b/config/AGKY2019.xml
@@ -24,7 +24,7 @@ KNO2PYTHIA-Wmax             double  No     relevant only for method=2
     <param type="string" name="CommonParam"> KNO2Pythia </param>
     
     <param type="alg" name="KNO-Hadronizer">      genie::AGKYLowW2019/Default     </param>
-    <param type="alg" name="PYTHIA-Hadronizer">   genie::Pythia6Hadro2019/Default </param>
+    <param type="alg" name="PYTHIA-Hadronizer">   genie::Pythia8Hadro2019/Default </param>
 
   </param_set>
 
diff --git a/config/AGKYLowW2019.xml b/config/AGKYLowW2019.xml
index 766766d16..e1c9536d3 100644
--- a/config/AGKYLowW2019.xml
+++ b/config/AGKYLowW2019.xml
@@ -65,7 +65,7 @@ KNO-ProbKplusKminus               double  No    probability for K+K- pair
 KNO-ProbK0K0bar                   double  No    probability for K0 K0bar pair                 KNO-ProbK0K0bar
 KNO-ProbPi0Eta                    double  No    probability for Pi0 Eta pair                  KNO-ProbPi0Eta
 KNO-ProbEtaEta                    double  No    Probability for Eta Eta pair                  KNO-ProbEtaEta
-ForceDecays                   bool    Yes   force decays of unstable particles            false   
+ForceDecays                   bool    Yes   force decays of unstable particles            false
 Decayer                       alg     Dep   decayer to be used if decayes are forced
 ForceMinMultiplicity          bool    Yes   force a minimum multiplicity of 2             true
 GenerateWeighted              bool    Yes   generate weighted events                      false
@@ -77,112 +77,111 @@ KNO-PhaseSpDec-ReweightParm       double  Yes   parameter controlling the reweig
 -->
 
 <alg_conf>
-  <param_set name="Default"> 
-    
-    <param type="string" name="CommonParam">  NonResBackground </param> 
-    
-    <!-- 
-	 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-	 Parameters controlling the average charged hadron multiplicities in the AGKY/KNO model
-	 (paramerers a,b entering in the empirical expression: <n> = a + b * lnW^2 )
-	 See Nucl.Instrum.Meth.A614:87-104,2010 and Eur.Phys.J.C63:1-10,2009. 
+  <param_set name="Default">
+
+    <param type="string" name="CommonParam">  NonResBackground </param>
+
+    <!--
+         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+         Parameters controlling the average charged hadron multiplicities in the AGKY/KNO model
+         (paramerers a,b entering in the empirical expression: <n> = a + b * lnW^2 )
+         See Nucl.Instrum.Meth.A614:87-104,2010 and Eur.Phys.J.C63:1-10,2009.
     -->
-    <param type="double" name="KNO-Alpha-vp">  0.40 </param> 
-    <param type="double" name="KNO-Alpha-vn"> -0.20 </param> 
-    <param type="double" name="KNO-Alpha-vbp"> 0.02 </param> 
-    <param type="double" name="KNO-Alpha-vbn"> 0.80 </param> 
-    <param type="double" name="KNO-Beta-vp">   1.42 </param> 
-    <param type="double" name="KNO-Beta-vn">   1.42 </param> 
-    <param type="double" name="KNO-Beta-vbp">  1.28 </param> 
-    <param type="double" name="KNO-Beta-vbn">  0.95 </param> 
-
-    <param type="double" name="KNO-EM-Alpha-vp">  0.40 </param> 
-    <param type="double" name="KNO-EM-Alpha-vn"> -0.20 </param> 
-    <param type="double" name="KNO-EM-Alpha-vbp"> 0.02 </param> 
-    <param type="double" name="KNO-EM-Alpha-vbn"> 0.80 </param> 
-    <param type="double" name="KNO-EM-Beta-vp">   1.42 </param> 
-    <param type="double" name="KNO-EM-Beta-vn">   1.42 </param> 
-    <param type="double" name="KNO-EM-Beta-vbp">  1.28 </param> 
-    <param type="double" name="KNO-EM-Beta-vbn">  0.95 </param> 
-    
-    <!-- 
-	 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-	 Parameters controlling the probability of producing a strange baryon via associated production.
-	 (paramerers a,b entering in the empirical expression: P_{hyperon} = a + b * lnW^2 )
-	 Determined from a fit to \Lambda production data.
-	 See Nucl.Instrum.Meth.A614:87-104,2010 and Eur.Phys.J.C63:1-10,2009. 
+    <param type="double" name="KNO-Alpha-vp">  0.40 </param>
+    <param type="double" name="KNO-Alpha-vn"> -0.20 </param>
+    <param type="double" name="KNO-Alpha-vbp"> 0.02 </param>
+    <param type="double" name="KNO-Alpha-vbn"> 0.80 </param>
+    <param type="double" name="KNO-Beta-vp">   1.42 </param>
+    <param type="double" name="KNO-Beta-vn">   1.42 </param>
+    <param type="double" name="KNO-Beta-vbp">  1.28 </param>
+    <param type="double" name="KNO-Beta-vbn">  0.95 </param>
+
+    <param type="double" name="KNO-EM-Alpha-vp">  0.40 </param>
+    <param type="double" name="KNO-EM-Alpha-vn"> -0.20 </param>
+    <param type="double" name="KNO-EM-Alpha-vbp"> 0.02 </param>
+    <param type="double" name="KNO-EM-Alpha-vbn"> 0.80 </param>
+    <param type="double" name="KNO-EM-Beta-vp">   1.42 </param>
+    <param type="double" name="KNO-EM-Beta-vn">   1.42 </param>
+    <param type="double" name="KNO-EM-Beta-vbp">  1.28 </param>
+    <param type="double" name="KNO-EM-Beta-vbn">  0.95 </param>
+
+    <!--
+         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+         Parameters controlling the probability of producing a strange baryon via associated production.
+         (paramerers a,b entering in the empirical expression: P_{hyperon} = a + b * lnW^2 )
+         Determined from a fit to \Lambda production data.
+         See Nucl.Instrum.Meth.A614:87-104,2010 and Eur.Phys.J.C63:1-10,2009.
     -->
-    <param type="double" name="KNO-Alpha-Hyperon"> 0.021951447 </param> 
-    <param type="double" name="KNO-Beta-Hyperon">  0.041969985 </param> 
-    
-    <!-- 
-	 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-	 Levy function (KNO parameterization) parameter c at kno(z) = 2*exp(-c)*pow(c,cz+1)/Gamma(cz+1)
-	 v+p    : 7.93 +/- 0.34 source: Tingjun's fit
-	 v+n    : 5.22 +/- 0.15 source: Tingjun's fit
-	 vbar+p : same as vn
-	 vbar+n : same as vp
+    <param type="double" name="KNO-Alpha-Hyperon"> 0.021951447 </param>
+    <param type="double" name="KNO-Beta-Hyperon">  0.041969985 </param>
+
+    <!--
+         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+         Levy function (KNO parameterization) parameter c at kno(z) = 2*exp(-c)*pow(c,cz+1)/Gamma(cz+1)
+         v+p    : 7.93 +/- 0.34 source: Tingjun's fit
+         v+n    : 5.22 +/- 0.15 source: Tingjun's fit
+         vbar+p : same as vn
+         vbar+n : same as vp
     -->
-    <param type="double" name="KNO-LevyC-vp">  7.93 </param> 
-    <param type="double" name="KNO-LevyC-vn">  5.22 </param> 
-    <param type="double" name="KNO-LevyC-vbp"> 5.22 </param> 
-    <param type="double" name="KNO-LevyC-vbn"> 7.93 </param> 
-    
-    <param type="double" name="KNO-EM-LevyC-vp">  7.93 </param> 
-    <param type="double" name="KNO-EM-LevyC-vn">  5.22 </param> 
-    <param type="double" name="KNO-EM-LevyC-vbp"> 5.22 </param> 
-    <param type="double" name="KNO-EM-LevyC-vbn"> 7.93 </param> 
-    
-    <!-- 
-	 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-	 AGKY/KNO hadronization model probabilities for producing hadron pairs.
-	 See Nucl.Instrum.Meth.A614:87-104,2010 and Eur.Phys.J.C63:1-10,2009. 
-	 Values below are modified values following strange hadron production tuning (see gDocDB-890-v1).
-	 Previous values were P(pi0 pi0) = 0.30, P(pi+ pi-) = 0.60, P(K+ K-) = 0.05, P(K0 \barK0) = 0.05.
+    <param type="double" name="KNO-LevyC-vp">  7.93 </param>
+    <param type="double" name="KNO-LevyC-vn">  5.22 </param>
+    <param type="double" name="KNO-LevyC-vbp"> 5.22 </param>
+    <param type="double" name="KNO-LevyC-vbn"> 7.93 </param>
+
+    <param type="double" name="KNO-EM-LevyC-vp">  7.93 </param>
+    <param type="double" name="KNO-EM-LevyC-vn">  5.22 </param>
+    <param type="double" name="KNO-EM-LevyC-vbp"> 5.22 </param>
+    <param type="double" name="KNO-EM-LevyC-vbn"> 7.93 </param>
+
+    <!--
+         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+         AGKY/KNO hadronization model probabilities for producing hadron pairs.
+         See Nucl.Instrum.Meth.A614:87-104,2010 and Eur.Phys.J.C63:1-10,2009.
+         Values below are modified values following strange hadron production tuning (see gDocDB-890-v1).
+         Previous values were P(pi0 pi0) = 0.30, P(pi+ pi-) = 0.60, P(K+ K-) = 0.05, P(K0 \barK0) = 0.05.
     -->
     <param type="double" name="KNO-ProbPi0Pi0">        0.3133 </param>
     <param type="double" name="KNO-ProbPiplusPiminus"> 0.6267 </param>
     <param type="double" name="KNO-ProbKplusKminus">   0.03 </param>
     <param type="double" name="KNO-ProbK0K0bar">       0.03 </param>
-    <param type="double" name="KNO-ProbPi0Eta">        0.0 </param> 
+    <param type="double" name="KNO-ProbPi0Eta">        0.0 </param>
     <param type="double" name="KNO-ProbEtaEta">        0.0   </param>
-    
-    <!-- 
-	 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-	 Parameters controlling whether to reweight the KNO phase space decay reweighting and the actual
-	 reweighting function.
-	 See: A.B.Clegg, A.Donnachie, A Description of Jet Structure by pT-limited Phase Space.
+
+    <!--
+         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+         Parameters controlling whether to reweight the KNO phase space decay reweighting and the actual
+         reweighting function.
+         See: A.B.Clegg, A.Donnachie, A Description of Jet Structure by pT-limited Phase Space.
     -->
     <param type="bool"   name="KNO-PhaseSpDec-Reweight">     true  </param>
-    <param type="double" name="KNO-PhaseSpDec-ReweightParm"> 3.5   </param> 
-    
-     <!-- 
-	  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-	  Parameters controlling whether to use the baryon xF and pT2 pdfs in the KNO hadronization.
-	  The option to use isotropic, non-reweighted 2-body phase space decays is used for compatibility
-	  with neugen/daikon.
+    <param type="double" name="KNO-PhaseSpDec-ReweightParm"> 3.5   </param>
+
+     <!--
+          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+          Parameters controlling whether to use the baryon xF and pT2 pdfs in the KNO hadronization.
+          The option to use isotropic, non-reweighted 2-body phase space decays is used for compatibility
+          with neugen/daikon.
      -->
      <param type="bool" name="KNO-UseBaryonPdfs-xFpT2">  true  </param>
      <param type="bool" name="KNO-UseIsotropic2BodyDec"> true  </param>
 
   </param_set>
-  
-  <param_set name="Default-Decaying"> 
-    <param type="bool" name="ForceDecays">  true                            </param>
-    <param type="alg"  name="Decayer">      genie::PythiaDecayer/Default    </param>
+
+  <param_set name="Default-Decaying">
+    <param type="bool" name="ForceDecays">  true                                 </param>
+    <param type="alg"  name="Decayer">      genie::Pythia8Decayer2023/Default    </param>
   </param_set>
-  
-  <param_set name="Old"> 
+
+  <param_set name="Old">
      <param type="bool" name="KNO-UseBaryonPdfs-xFpT2">  false  </param>
      <param type="bool" name="KNO-PhaseSpDec-Reweight">  false  </param>
   </param_set>
 
-  <param_set name="Old-Decaying"> 
+  <param_set name="Old-Decaying">
      <param type="bool" name="ForceDecays">           true                            </param>
-     <param type="alg"  name="Decayer">               genie::PythiaDecayer/Default    </param>
+     <param type="alg"  name="Decayer">               genie::Pythia8Decayer2023/Default   </param>
      <param type="bool" name="KNO-UseBaryonPdfs-xFpT2">   false                           </param>
      <param type="bool" name="KNO-PhaseSpDec-Reweight">   false                           </param>
   </param_set>
 
 </alg_conf>
-
diff --git a/config/DISHadronicSystemGenerator.xml b/config/DISHadronicSystemGenerator.xml
index fbe296f40..51de28438 100644
--- a/config/DISHadronicSystemGenerator.xml
+++ b/config/DISHadronicSystemGenerator.xml
@@ -10,41 +10,40 @@ Algorithm Configurable Parameters:
 .......................................................................................................................
 Name                Type    Opt   Comment                                                   Default
 .......................................................................................................................
-Hadronizer          alg     No   
+Hadronizer          alg     No
 PreTransportDecayer alg     No
 FilterPreFragm      bool    No
-FZONE-ct0pion       double  No                                                              
-FZONE-ct0nucleon    double  No                                                              
-FZONE-Kpt2          double  No 
+FZONE-ct0pion       double  No
+FZONE-ct0nucleon    double  No
+FZONE-Kpt2          double  No
 NUCL-R0             double  No                                                              CommonParam[NUCL]
 NUCL-NR             double  No                                                              CommonParam[NUCL]
 -->
 
-  <param_set name="Default"> 
+  <param_set name="Default">
      <param type="string"  name="CommonParam"> NUCL </param>
 
      <param type="alg"  name="Hadronizer">          genie::AGKY2019/Default                 </param>
      <param type="alg"  name="PreTransportDecayer"> genie::UnstableParticleDecayer/BeforeHadronTransport  </param>
      <param type="bool" name="FilterPreFragm">      false                                                 </param>
- 
-     <!-- 	
-	  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-	  Parameters relevant to formation zone simulation
-	  - ct0 is the formation time times the speed of light (given in fm)
-	  - KPt2 is the parameter multiplying pT2 in formation zone calc.
+
+     <!--
+          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+          Parameters relevant to formation zone simulation
+          - ct0 is the formation time times the speed of light (given in fm)
+          - KPt2 is the parameter multiplying pT2 in formation zone calc.
      -->
      <param type="double" name="FZONE-ct0pion">       0.342   </param>
      <param type="double" name="FZONE-ct0nucleon">    2.300   </param>
      <param type="double" name="FZONE-KPt2">          0.0     </param>
-     
+
   </param_set>
 
-  <param_set name="Charm"> 
-     <param type="alg"  name="Hadronizer">          genie::AGCharm2019/Default                     </param>
+  <param_set name="Charm">
+     <param type="alg"  name="Hadronizer">          genie::AGCharmPythia8Hadro2023/Default                </param>
      <param type="alg"  name="PreTransportDecayer"> genie::UnstableParticleDecayer/BeforeHadronTransport  </param>
      <param type="bool" name="FilterPreFragm">      false                                                 </param>
 
   </param_set>
 
 </alg_conf>
-
diff --git a/config/UnstableParticleDecayer.xml b/config/UnstableParticleDecayer.xml
index 7ab5c32af..08237bab1 100644
--- a/config/UnstableParticleDecayer.xml
+++ b/config/UnstableParticleDecayer.xml
@@ -10,22 +10,22 @@ Configurable Parameters:
 Name             Type     Optional   Comment               Default
 .......................................................................................................
 -->
- 
+
   <param_set name="BeforeHadronTransport">
      <param type="int" name="NDecayers">  2                                                    </param>
-     <param type="alg" name="Decayer-0">  genie::PythiaDecayer/BeforeHadronTransport           </param>
+     <param type="alg" name="Decayer-0">  genie::Pythia8Decayer2023/BeforeHadronTransport      </param>
      <param type="alg" name="Decayer-1">  genie::BaryonResonanceDecayer/BeforeHadronTransport  </param>
   </param_set>
 
   <param_set name="AfterHadronTransport">
      <param type="int" name="NDecayers">  2                                                    </param>
-     <param type="alg" name="Decayer-0">  genie::PythiaDecayer/AfterHadronTransport            </param>
+     <param type="alg" name="Decayer-0">  genie::Pythia8Decayer2023/AfterHadronTransport       </param>
      <param type="alg" name="Decayer-1">  genie::BaryonResonanceDecayer/AfterHadronTransport   </param>
   </param_set>
 
   <param_set name="DarkSector">
      <param type="int" name="NDecayers">  3                                                    </param>
-     <param type="alg" name="Decayer-0">  genie::PythiaDecayer/AfterHadronTransport            </param>
+     <param type="alg" name="Decayer-0">  genie::Pythia8Decayer2023/AfterHadronTransport       </param>
      <param type="alg" name="Decayer-1">  genie::BaryonResonanceDecayer/AfterHadronTransport   </param>
      <param type="alg" name="Decayer-2">  genie::DarkSectorDecayer/Default </param>
   </param_set>