diff --git a/Doc/HerwigDefaults.in.in b/Doc/HerwigDefaults.in.in
--- a/Doc/HerwigDefaults.in.in
+++ b/Doc/HerwigDefaults.in.in
@@ -1,41 +1,53 @@
 # @configure_input@
 #
 # output interfaces for documentation
 # the following need to come first
 globallibrary Herwig.so
 library HwWeakCurrents.so
 #
 library Hw64Decay.so
 library HwAnalysis.so
 library HwFormFactors.so
 library HwMamboDecay.so
 library HwMEHadronFast.so
 library HwMEHadron.so
 library HwMEDIS.so
 library HwMELepton.so
 library HwMEGammaGamma.so
 library HwMEGammaHadron.so
 library HwPowhegMEHadron.so
 library HwPowhegMELepton.so
 library JetCuts.so
 library SimpleKTCut.so
 library HwMPI.so
 library HwReggeonPDF.so
 library HwPomeronPDF.so
 library HwPomeronFlux.so
 library HwPartonicDecay.so
 library HwPerturbativeDecay.so
 library HwShower.so
 library HwSMDecay.so
 library HwTauDecay.so
 library HwTMDecay.so
 library HwBaryonDecay.so
 library HwSOPHTY.so
 library HwVMDecay.so
 library HwSatPDF.so
 library HwIncomingPhotonEvolver.so
 @LOAD_BSM@
-## @LOAD_DIPOLE_ALPHAS@
-## @LOAD_MATCHBOX@
-## @LOAD_DIPOLE@
+library HwDipoleMatching.so
+library HwDipoleShowerAlphaS.so
+library HwDipoleShower.so
+library HwDipoleMatching.so
+library HwMatchboxBuiltin.so
+library HwMatchboxCuts.so
+library HwMatchboxGoSam.so
+library HwMatchboxMadGraph.so
+library HwMatchboxNJet.so
+library HwMatchboxOpenLoops.so
+library HwMatchboxScales.so
+library HwMatchboxVBFNLO.so
+library HwMatching.so
+library HwQTildeMatching.so
+library HwKrknloEventReweight.so
 doxygendump Herwig:: AllInterfaces.h
diff --git a/src/snippets/EPCollider.in b/src/snippets/EPCollider.in
--- a/src/snippets/EPCollider.in
+++ b/src/snippets/EPCollider.in
@@ -1,49 +1,49 @@
 # -*- ThePEG-repository -*-
 cd /Herwig/EventHandlers
 create ThePEG::LuminosityFunction Luminosity
 set EventHandler:BeamA /Herwig/Particles/e-
 set Luminosity:BeamEMaxA 30.*GeV
 set EventHandler:BeamB /Herwig/Particles/p+
 set Luminosity:BeamEMaxB 920.*GeV
 set EventHandler:LuminosityFunction Luminosity
 set /Herwig/Shower/ShowerHandler:MPIHandler NULL
 set /Herwig/Shower/PowhegShowerHandler:MPIHandler NULL
 set /Herwig/DipoleShower/DipoleShowerHandler:MPIHandler NULL
 
 # cuts for DIS
 set EventHandler:Cuts:ScaleMin 1.0*GeV2
 set EventHandler:Cuts:X1Min 1.0e-5
 set EventHandler:Cuts:X2Min 1.0e-5
 set EventHandler:Cuts:MHatMin 0.0*GeV
 set /Herwig/Cuts/NeutralCurrentCut:MinW2 0
 set /Herwig/Cuts/NeutralCurrentCut:MaxW2 1e10
 set /Herwig/Cuts/ChargedCurrentCut:MinW2 0
 set /Herwig/Cuts/ChargedCurrentCut:MaxW2 1e10
 clear EventHandler:Cuts:OneCuts
 clear EventHandler:Cuts:TwoCuts
 clear EventHandler:Cuts:MultiCuts
 insert EventHandler:Cuts:TwoCuts[0] /Herwig/Cuts/NeutralCurrentCut
 insert EventHandler:Cuts:TwoCuts[1] /Herwig/Cuts/ChargedCurrentCut
 
 # switch off final-state electron/muon FSR
 do /Herwig/Shower/SplittingGenerator:DeleteFinalSplitting e-->e-,gamma; /Herwig/Shower/LtoLGammaSudakov
 do /Herwig/Shower/SplittingGenerator:DeleteFinalSplitting mu-->mu-,gamma; /Herwig/Shower/LtoLGammaSudakov
 do /Herwig/Shower/SplittingGenerator:DeleteFinalSplitting tau-->tau-,gamma; /Herwig/Shower/LtoLGammaSudakov
 set /Herwig/Shower/KinematicsReconstructor:ReconstructionOption Colour
 # Matchbox settings
 cd /Herwig/MatrixElements/Matchbox
-set Factory:FirstPerturbativePDF Yes
-set Factory:SecondPerturbativePDF No
+set Factory:FirstPerturbativePDF No
+set Factory:SecondPerturbativePDF Yes
 set Factory:PartonExtractor /Herwig/Partons/EPExtractor
 
 set /Herwig/Merging/MergingFactory:FirstPerturbativePDF No
 set /Herwig/Merging/MergingFactory:SecondPerturbativePDF Yes
 set /Herwig/Merging/MergingFactory:PartonExtractor /Herwig/Partons/EPExtractor
 
 #  Erase the PDF for the lepton side (the one from Particle Data object is used)
 set /Herwig/Shower/ShowerHandler:PDFA NULL
 set /Herwig/DipoleShower/DipoleShowerHandler:PDFA NULL
 
 cd /Herwig/Generators/
 set /Herwig/MatrixElements/SubProcess:PartonExtractor /Herwig/Partons/EPExtractor