diff --git a/Visualisation/CLIC_o3_v06_CED/CLIC_o3_v06_CED.xml b/Visualisation/CLIC_o3_v06_CED/CLIC_o3_v06_CED.xml
index e43de5b..31541bb 100644
--- a/Visualisation/CLIC_o3_v06_CED/CLIC_o3_v06_CED.xml
+++ b/Visualisation/CLIC_o3_v06_CED/CLIC_o3_v06_CED.xml
@@ -210,9 +210,9 @@
         <vis name="VXDVis"   alpha="1.0" r="0.96" g="0.42"  b="0.13"  showDaughters="true"  visible="true"/>
         <vis name="OTVis"    alpha="1.0" r="0.90" g="0.80"  b="0.0"  showDaughters="true"  visible="true"/>
         <vis name="ECALVis"  alpha="1.0" r="0.00" g="0.50"  b="0.05" showDaughters="true"  visible="true"/>
-        <vis name="SOLVis"   alpha="1.0" r="0.75" g="0.73"  b="0.70" showDaughters="true"  visible="true"/>
-        <vis name="SOLVis2"  alpha="1.0" r="0.52" g="0.50"  b="0.47" showDaughters="true"  visible="true"/>
-        <vis name="HCALVis"  alpha="1.0" r="0.85" g="0.85"  b="0.85" showDaughters="true"  visible="true"/>
+        <vis name="SOLVis"   alpha="1.0" r="0.70" g="0.68"  b="0.65" showDaughters="true"  visible="true"/>
+        <vis name="SOLVis2"  alpha="1.0" r="0.42" g="0.40"  b="0.37" showDaughters="true"  visible="true"/>
+        <vis name="HCALVis"  alpha="1.0" r="0.75" g="0.75"  b="0.75" showDaughters="true"  visible="true"/>
         <vis name="YOKEVis"  alpha="1.0" r="1.00" g="0.00"  b="0.0"  showDaughters="true"  visible="true"/>
         <vis name="LCALVis"  alpha="1.0" r="1.00" g="0.68"  b="0.31" showDaughters="true"  visible="true"/>
         <vis name="BCALVis"  alpha="1.0" r="1.00" g="0.49"  b="0.17" showDaughters="true"  visible="true"/>
diff --git a/Visualisation/CLIC_o3_v06_CED/ced2go-template-DD4.xml b/Visualisation/CLIC_o3_v06_CED/ced2go-template-DD4.xml
index 2c2989e..d87db7c 100644
--- a/Visualisation/CLIC_o3_v06_CED/ced2go-template-DD4.xml
+++ b/Visualisation/CLIC_o3_v06_CED/ced2go-template-DD4.xml
@@ -99,110 +99,19 @@
   <!--parameter name="Verbosity" type="string">DEBUG </parameter-->
   <!--Wait for Keyboard before proceed-->
   <parameter name="WaitForKeyboard" type="int">1 </parameter>
-  <parameter name="DrawInLayer"> 
-    VXDCollection 0 5 1
-    SITCollection 0 5 1
-    FTD_PIXELCollection 0 5 1
-    FTD_STRIPCollection 0 5 1
-    FTDCollection 0 5 1
-    TPCCollection 0 3 1
-    SETCollection 0 3 1
-    ETDCollection 0 3 1
-    VertexBarrelCollection 0 5 1
-    VertexEndcapCollection 0 5 1
-    InnerTrackerBarrelCollection 0 5 1
-    InnerTrackerEndcapCollection 0 5 1
-    OuterTrackerBarrelCollection 0 5 1
-    OuterTrackerEndcapCollection 0 5 1
-    
-     VXDTrackerHits       0  5  11
-     SITTrackerHits       0  5  11
-     TPCTrackerHits       0  5  11
-     FTDTrackerHits       0  5  11
-     FTDStripTrackerHits  0  5  11
-     FTDPixelTrackerHits  0  5  11
-     FTDSpacePoints       0  5  11
-     SETTrackerHits       0  5  11
-     ITrackerEndcapHits    0 5 11
-     ITrackerHits          0 5 11
-     OTrackerEndcapHits    0 5 11
-     OTrackerHits          0 5 11
-     VXDEndcapTrackerHits  0 5 11
+  <parameter name="DrawInLayer">
+	PandoraPFOs 0 3 3
+	LE_LooseSelectedPandoraPFOs 0 3 4
+	LE_SelectedPandoraPFOs 0 3 5
+	LE_TightSelectedPandoraPFOs 0 3 6
+	LooseSelectedPandoraPFOs 0 3 7
+	SelectedPandoraPFOs 0 3 8
+	TightSelectedPandoraPFOs 0 3 9
 
-     HcalEndCapsCollection       0 3 2
-     LHcalCollection             0 3 2
-     LumiCalCollection           0 3 2
-     MuonBarrelCollection        0 3 2
-     MuonEndCapCollection        0 3 2
-     EcalBarrelSiliconCollection 0 3 2  
-     EcalBarrelSiliconPreShower  0 3 2  
-     EcalEndcapRingCollection    0 3 2  
-     EcalEndcapRingPreShower     0 3 2  
-     EcalEndcapSiliconCollection 0 3 2  
-     EcalEndcapSiliconPreShower  0 3 2  
-     HcalBarrelRegCollection     0 3 2
-     HcalEndCapRingsCollection   0 3 2
-
-     ECalBarrelCollection 0 3 2
-     ECalEndcapCollection 0 3 2
-     ECalPlugCollection 0 3 2
-     HCalBarrelCollection 0 3 2
-     HCalEndcapCollection 0 3 2
-     HCalRingCollection 0 3 2
-     YokeBarrelCollection 0 3 2
-     YokeEndcapCollection 0 3 2
-     LumiCalCollection 0 3 2
-     BeamCalCollection 0 3 2
-
-
-     HCALEndcap   0 5 12
-     HCALOther    0 5 12
-     MUON         0 2 12
-     LHCAL        0 3 12  
-     LCAL         0 3 12
-     BCAL         0 3 12
-     ECALBarrel   0 2 12
-     ECALEndcap   0 2 12
-     ECALOther    0 2 12
-     HCALBarrel   0 5 12
-
-     TruthTracks      0 6 3
-     ForwardTracks    0 6 4
-     SiTracks         0 6 5
-     ClupatraTracks   0 6 6
-     MarlinTrkTracks  0 6 7
-
-     PandoraClusters  0 3 8
-     PandoraPFOs      0 3 9
      
      MCParticle 0 3 0
 
-     VertexBarrelHits 0 5 11
-     VertexEndcapHits 0 5 11
-     InnerTrackerBarrelHits 0 5 11
-     InnerTrackerEndcapHits 0 5 11
-     OuterTrackerBarrelHits 0 5 11
-     OuterTrackerEndcapHits 0 5 11
-
-     ECalBarrelHits 0 3 12
-     ECalEndcapHits 0 3 12
-     ECalPlugHits 0 3 12
-     HCalBarrelHits 0 3 12
-     HCalEndcapHits 0 3 12
-     HCalRingHits 0 3 12
-     YokeBarrelHits 0 3 12
-     YokeEndcapHits 0 3 12
-     LumiCalHits 0 3 12
-     BeamCalHits 0 3 12
-     
-     Tracks 0 3 3
 
-     SelectedPandoraPFOCollection 0 3 4
-     LooseSelectedPandoraPFOCollection 0 3 5
-     TightSelectedPandoraPFOCollection 0 3 6
-     TightSelectedPandoraPFANewPFOs 0 3 6
-     PandoraPFOCollection 0 3 7
-     JetOut 0 0 3
 
   </parameter>
 </processor>