diff --git a/src/GafferScene/Render.cpp b/src/GafferScene/Render.cpp
index 6c80dbc644c..3027a6fdb7b 100644
--- a/src/GafferScene/Render.cpp
+++ b/src/GafferScene/Render.cpp
@@ -346,7 +346,6 @@ void Render::executeInternal( bool flushCaches ) const
 	Monitor::Scope performanceMonitorScope( performanceMonitor );
 
 	GafferScene::Private::RendererAlgo::outputOptions( renderOptions.globals.get(), renderer.get() );
-	GafferScene::Private::RendererAlgo::outputOutputs( inPlug(), renderOptions.globals.get(), renderer.get() );
 
 	{
 		// Using nested scope so that we free the memory used by `renderSets`
@@ -361,6 +360,8 @@ void Render::executeInternal( bool flushCaches ) const
 		GafferScene::Private::RendererAlgo::outputObjects( adaptedInPlug(), renderOptions, renderSets, &lightLinks, renderer.get() );
 	}
 
+	GafferScene::Private::RendererAlgo::outputOutputs( inPlug(), renderOptions.globals.get(), renderer.get() );
+
 	if( renderScope.sceneTranslationOnly() )
 	{
 		return;
diff --git a/src/IECoreDelight/Renderer.cpp b/src/IECoreDelight/Renderer.cpp
index f6cca829761..b4d00338b30 100644
--- a/src/IECoreDelight/Renderer.cpp
+++ b/src/IECoreDelight/Renderer.cpp
@@ -265,8 +265,6 @@ class DelightOutput : public IECore::RefCounted
 			driverParams.add( { "drivername", &typePtr, NSITypeString, 0, 1, 0 } );
 			driverParams.add( { "imagefilename", &namePtr, NSITypeString, 0, 1, 0 } );
 
-			m_driverHandle = DelightHandle( context, "outputDriver:" + name, ownership, "outputdriver", driverParams );
-
 			// Layer
 
 			string variableName;
@@ -327,7 +325,7 @@ class DelightOutput : public IECore::RefCounted
 				layerName = IECore::CamelCase::join( layerTokens.begin(), layerTokens.end(), IECore::CamelCase::AllExceptFirst);
 			}
 
-			ParameterList layerParams;
+			ParameterList layerParams( output->parameters() );
 
 			layerParams.add( "variablename", variableName );
 			layerParams.add( "variablesource", variableSource );
@@ -335,10 +333,37 @@ class DelightOutput : public IECore::RefCounted
 			layerParams.add( "layername", layerName );
 			layerParams.add( { "withalpha", &withAlpha, NSITypeInteger, 0, 1, 0 } );
 
-			const string scalarFormat = this->scalarFormat( output );
-			const string colorProfile = scalarFormat == "float" ? "linear" : "sRGB";
-			layerParams.add( "scalarformat", scalarFormat );
-			layerParams.add( "colorprofile", colorProfile );
+			const double filterSize = parameter<float>( output->parameters(), "filtersize", 3.0 );
+			if( filterSize != 3.0 )
+			{
+				layerParams.add( { "filterwidth", &filterSize, NSITypeDouble, 0, 1, 0 } );
+			}
+
+			const string scalarFormatQuant = this->scalarFormat( output );
+			const string colorProfileQuant = scalarFormatQuant == "float" ? "linear" : "sRGB";
+			const string scalarFormat = parameter<string>( output->parameters(), "scalarformat", "" );
+			if( scalarFormat == "" )
+			{
+				layerParams.add( "scalarformat", scalarFormatQuant );
+				layerParams.add( "colorprofile", colorProfileQuant );
+			}
+
+			const string lightGroup = parameter<string>( output->parameters(), "lightgroup", "" );
+			vector<string> lightGroupTokens;
+			if( lightGroup != "" )
+			{
+				IECore::StringAlgo::tokenize( lightGroup, ' ', lightGroupTokens );
+			}
+
+			const string customDriverName = parameter<string>( output->parameters(), "customdrivername", "" );
+			if( customDriverName == "" )
+			{
+				m_driverHandle = DelightHandle( context, "outputDriver:" + name, ownership, "outputdriver", driverParams );
+			}
+			else
+			{
+				m_driverHandle = DelightHandle( context, "outputDriver:" + customDriverName, ownership, "outputdriver", driverParams );
+			}
 
 			m_layerHandle = DelightHandle( context, "outputLayer:" + name, ownership, "outputlayer", layerParams );
 
@@ -348,6 +373,19 @@ class DelightOutput : public IECore::RefCounted
 				m_layerHandle.name(), "outputdrivers",
 				0, nullptr
 			);
+
+			if( lightGroup != "" )
+			{
+				for( string lightGroupToken : lightGroupTokens )
+				{
+					NSIConnect(
+						m_context,
+						lightGroupToken.c_str(), "",
+						m_layerHandle.name(), "lightset",
+						0, nullptr
+					);
+				}
+			}
 		}
 
 		const DelightHandle &layerHandle() const
@@ -368,7 +406,7 @@ class DelightOutput : public IECore::RefCounted
 			{
 				return "uint8";
 			}
-			else if( quantize == vector<int>( { 0, 65536, 0, 65536 } ) )
+			else if( quantize == vector<int>( { 0, 65535, 0, 65535 } ) )
 			{
 				return "uint16";
 			}
diff --git a/startup/gui/outputs.py b/startup/gui/outputs.py
index 15997a6f514..c0222b6abd2 100644
--- a/startup/gui/outputs.py
+++ b/startup/gui/outputs.py
@@ -185,45 +185,209 @@
 	# https://gitlab.com/3Delight/3delight-for-houdini/-/blob/master/ui/aov.cpp
 	# See `contrib/scripts/3delightOutputs.py` in this repository for a helper script.
 
+	GafferScene.Outputs.registerOutput(
+		"Interactive/3Delight/Beauty_3Delight",
+		IECoreScene.Output(
+			"beauty",
+			"ieDisplay",
+			"rgba",
+			{
+				"catalogue:imageName" : "Image",
+				"driverType" : "ClientDisplayDriver",
+				"displayHost" : "localhost",
+				"displayPort" : "${image:catalogue:port}",
+				"remoteDisplayType" : "GafferImage::GafferDisplayDriver",
+				"scalarformat" : "half",
+				"colorprofile" : "linear",
+				"filter" : "blackman-harris",
+				"filtersize" : 3.0,
+			}
+		)
+	)
+
+	GafferScene.Outputs.registerOutput(
+		"Batch/3Delight/Beauty_3Delight",
+		IECoreScene.Output(
+			"${project:rootDirectory}/renders/${script:name}/${renderPass}/beauty/beauty.####.exr",
+			"exr",
+			"rgba",
+			{
+				"scalarformat" : "half",
+				"colorprofile" : "linear",
+				"filter" : "blackman-harris",
+				"filtersize" : 3.0,
+			}
+		)
+	)
+
+	GafferScene.Outputs.registerOutput(
+		"Batch/3Delight/Crypto/Surface_Shader_Cryptomatte_Header",
+		IECoreScene.Output(
+			"${project:rootDirectory}/renders/${script:name}/${renderPass}/id.surfaceshader/id.surfaceshader.####.exr",
+			"exr",
+			"color builtin:id.surfaceshader",
+			{
+				"scalarformat" : "half",
+				"sortkey" : 1,
+				"filter" : "cryptomatteheader",
+			}
+		)
+	)
+
+	GafferScene.Outputs.registerOutput(
+		"Batch/3Delight/Crypto/Surface_Shader_Cryptomatte_Layer0",
+		IECoreScene.Output(
+			"${project:rootDirectory}/renders/${script:name}/${renderPass}/id.surfaceshader/id.surfaceshader.####.exr",
+			"exr",
+			"quad builtin:id.surfaceshader",
+			{
+				"scalarformat" : "float",
+				"sortkey" : 2,
+				"filter" : "cryptomattelayer0",
+				"customdrivername" : "Batch/3Delight/Crypto/Surface_Shader_Cryptomatte_Header",
+			}
+		)
+	)
+
+	GafferScene.Outputs.registerOutput(
+		"Batch/3Delight/Crypto/Surface_Shader_Cryptomatte_Layer2",
+		IECoreScene.Output(
+			"${project:rootDirectory}/renders/${script:name}/${renderPass}/id.surfaceshader/id.surfaceshader.####.exr",
+			"exr",
+			"quad builtin:id.surfaceshader",
+			{
+				"scalarformat" : "float",
+				"sortkey" : 3,
+				"filter" : "cryptomattelayer2",
+				"customdrivername" : "Batch/3Delight/Crypto/Surface_Shader_Cryptomatte_Header",
+			}
+		)
+	)
+
+	GafferScene.Outputs.registerOutput(
+		"Batch/3Delight/Crypto/Geometry_Cryptomatte_Header",
+		IECoreScene.Output(
+			"${project:rootDirectory}/renders/${script:name}/${renderPass}/id.geometry/id.geometry.####.exr",
+			"exr",
+			"color builtin:id.geometry",
+			{
+				"scalarformat" : "half",
+				"sortkey" : 1,
+				"filter" : "cryptomatteheader",
+			}
+		)
+	)
+
+	GafferScene.Outputs.registerOutput(
+		"Batch/3Delight/Crypto/Geometry_Cryptomatte_Layer0",
+		IECoreScene.Output(
+			"${project:rootDirectory}/renders/${script:name}/${renderPass}/id.geometry/id.geometry.####.exr",
+			"exr",
+			"quad builtin:id.geometry",
+			{
+				"scalarformat" : "float",
+				"sortkey" : 2,
+				"filter" : "cryptomattelayer0",
+				"customdrivername" : "Batch/3Delight/Crypto/Geometry_Cryptomatte_Header",
+			}
+		)
+	)
+
+	GafferScene.Outputs.registerOutput(
+		"Batch/3Delight/Crypto/Geometry_Cryptomatte_Layer2",
+		IECoreScene.Output(
+			"${project:rootDirectory}/renders/${script:name}/${renderPass}/id.geometry/id.geometry.####.exr",
+			"exr",
+			"quad builtin:id.geometry",
+			{
+				"scalarformat" : "float",
+				"sortkey" : 3,
+				"filter" : "cryptomattelayer2",
+				"customdrivername" : "Batch/3Delight/Crypto/Geometry_Cryptomatte_Header",
+			}
+		)
+	)
+
+	GafferScene.Outputs.registerOutput(
+		"Batch/3Delight/Crypto/Scene_Path_Cryptomatte_Header",
+		IECoreScene.Output(
+			"${project:rootDirectory}/renders/${script:name}/${renderPass}/id.scenepath/id.scenepath.####.exr",
+			"exr",
+			"color builtin:id.scenepath",
+			{
+				"scalarformat" : "half",
+				"sortkey" : 1,
+				"filter" : "cryptomatteheader",
+			}
+		)
+	)
+
+	GafferScene.Outputs.registerOutput(
+		"Batch/3Delight/Crypto/Scene_Path_Cryptomatte_Layer0",
+		IECoreScene.Output(
+			"${project:rootDirectory}/renders/${script:name}/${renderPass}/id.scenepath/id.scenepath.####.exr",
+			"exr",
+			"quad builtin:id.scenepath",
+			{
+				"scalarformat" : "float",
+				"sortkey" : 2,
+				"filter" : "cryptomattelayer0",
+				"customdrivername" : "Batch/3Delight/Crypto/Scene_Path_Cryptomatte_Header",
+			}
+		)
+	)
+
+	GafferScene.Outputs.registerOutput(
+		"Batch/3Delight/Crypto/Scene_Path_Cryptomatte_Layer2",
+		IECoreScene.Output(
+			"${project:rootDirectory}/renders/${script:name}/${renderPass}/id.scenepath/id.scenepath.####.exr",
+			"exr",
+			"quad builtin:id.scenepath",
+			{
+				"scalarformat" : "float",
+				"sortkey" : 3,
+				"filter" : "cryptomattelayer2",
+				"customdrivername" : "Batch/3Delight/Crypto/Scene_Path_Cryptomatte_Header",
+			}
+		)
+	)
+
 	for name, displayName, source, dataType in [
 		( "Ci", "Ci", "shader", "color" ),
-		( "Ci.direct", "Ci (direct)", "shader", "color" ),
-		( "Ci.indirect", "Ci (indirect)", "shader", "color" ),
+		( "Ci.direct", "Ci_(direct)", "shader", "color" ),
+		( "Ci.indirect", "Ci_(indirect)", "shader", "color" ),
 		( "diffuse", "Diffuse", "shader", "color" ),
-		( "diffuse.direct", "Diffuse (direct)", "shader", "color" ),
-		( "diffuse.indirect", "Diffuse (indirect)", "shader", "color" ),
-		( "hair", "Hair and Fur", "shader", "color" ),
-		( "subsurface", "Subsurface Scattering", "shader", "color" ),
+		( "diffuse.direct", "Diffuse_(direct)", "shader", "color" ),
+		( "diffuse.indirect", "Diffuse_(indirect)", "shader", "color" ),
+		( "hair", "Hair_and_Fur", "shader", "color" ),
+		( "subsurface", "Subsurface_Scattering", "shader", "color" ),
 		( "reflection", "Reflection", "shader", "color" ),
-		( "reflection.direct", "Reflection (direct)", "shader", "color" ),
-		( "reflection.indirect", "Reflection (indirect)", "shader", "color" ),
+		( "reflection.direct", "Reflection_(direct)", "shader", "color" ),
+		( "reflection.indirect", "Reflection_(indirect)", "shader", "color" ),
 		( "refraction", "Refraction", "shader", "color" ),
-		( "volume", "Volume Scattering", "shader", "color" ),
-		( "volume.direct", "Volume Scattering (direct)", "shader", "color" ),
-		( "volume.indirect", "Volume Scattering (indirect)", "shader", "color" ),
+		( "volume", "Volume_Scattering", "shader", "color" ),
+		( "volume.direct", "Volume_Scattering_(direct)", "shader", "color" ),
+		( "volume.indirect", "Volume_Scattering_(indirect)", "shader", "color" ),
 		( "incandescence", "Incandescence", "shader", "color" ),
-		( "toon_base", "Toon Base", "shader", "color" ),
-		( "toon_diffuse", "Toon Diffuse", "shader", "color" ),
-		( "toon_specular", "Toon Specular", "shader", "color" ),
-		( "toon_matte", "Toon Matte", "shader", "color" ),
-		( "toon_tint", "Toon Tint", "shader", "color" ),
+		( "toon_base", "Toon_Base", "shader", "color" ),
+		( "toon_diffuse", "Toon_Diffuse", "shader", "color" ),
+		( "toon_specular", "Toon_Specular", "shader", "color" ),
+		( "toon_matte", "Toon_Matte", "shader", "color" ),
+		( "toon_tint", "Toon_Tint", "shader", "color" ),
 		( "outlines", "Outlines", "shader", "quad" ),
 		( "albedo", "Albedo", "shader", "color" ),
-		( "z", "Z (depth)", "builtin", "float" ),
-		( "P.camera", "Camera Space Position", "builtin", "point" ),
-		( "N.camera", "Camera Space Normal", "builtin", "point" ),
-		( "P.world", "World Space Position", "builtin", "point" ),
-		( "N.world", "World Space Normal", "builtin", "point" ),
-		( "Pref", "Reference Position", "attribute", "point" ),
-		( "shadow_mask", "Shadow Mask", "shader", "color" ),
+		( "z", "Z_(depth)", "builtin", "float" ),
+		( "P.camera", "Camera_Space_Position", "builtin", "point" ),
+		( "N.camera", "Camera_Space_Normal", "builtin", "point" ),
+		( "P.world", "World_Space_Position", "builtin", "point" ),
+		( "N.world", "World_Space_Normal", "builtin", "point" ),
+		( "Pref", "Reference_Position", "attribute", "point" ),
+		( "shadow_mask", "Shadow_Mask", "shader", "color" ),
 		( "st", "UV", "attribute", "point" ),
-		( "id.geometry", "Geometry Cryptomatte", "builtin", "float" ),
-		( "id.scenepath", "Scene Path Cryptomatte", "builtin", "float" ),
-		( "id.surfaceshader", "Surface Shader Cryptomatte", "builtin", "float" ),
-		( "relighting_multiplier", "Relighting Multiplier", "shader", "color" ),
-		( "relighting_reference", "Relighting Reference", "shader", "color" ),
-		( "motionvector", "Motion Vector", "builtin", "point" ),
-		( "occlusion", "Ambient Occlusion", "shader", "color" ),
+		( "relighting_multiplier", "Relighting_Multiplier", "shader", "color" ),
+		( "relighting_reference", "Relighting_Reference", "shader", "color" ),
+		( "motionvector", "Motion_Vector", "builtin", "point" ),
+		( "occlusion", "Ambient_Occlusion", "shader", "color" ),
 	] :
 		GafferScene.Outputs.registerOutput(
 			"Interactive/3Delight/{}/{}".format( source.capitalize(), displayName ),
@@ -236,6 +400,12 @@
 					"displayHost" : "localhost",
 					"displayPort" : "${image:catalogue:port}",
 					"remoteDisplayType" : "GafferImage::GafferDisplayDriver",
+					"scalarformat" : "half",
+					"colorprofile" : "linear",
+					"filter" : "blackman-harris",
+					"filtersize" : 3.0,
+					"customdrivername" : "",
+					"lightgroup" : "",
 				}
 			)
 		)
@@ -246,6 +416,14 @@
 				"${project:rootDirectory}/renders/${script:name}/${renderPass}/%s/%s.####.exr" % ( name, name ),
 				"exr",
 				"{} {}:{}".format( dataType, source, name ),
+				{
+					"scalarformat" : "half",
+					"colorprofile" : "linear",
+					"filter" : "blackman-harris",
+					"filtersize" : 3.0,
+					"customdrivername" : "",
+					"lightgroup" : "",
+				}
 			)
 		)