diff --git a/hdr/crt-sony-megatron-arcade.slangp b/hdr/crt-sony-megatron-arcade.slangp
deleted file mode 100644
index 1578474..0000000
--- a/hdr/crt-sony-megatron-arcade.slangp
+++ /dev/null
@@ -1,76 +0,0 @@
-/* 
-Sony Megatron Colour Video Monitor
-Author: Major Pain The Cactus
-
-A shader that specifically tries to emulate arcade monitor's with an shadow mask screen but with full brightness. 
-
-The novel thing about this shader is that it transforms the image output by the 'console/arcade/computer' into HDR space first i.e brightens it first and then applies 
-an shadow mask afterwards which is kind of what a CRT would actually do - its kind of a kin to the electron beam (but nothing like it lol). 
-
-My DisplayHDR 600 monitor does seem to get reasonably close to the brightness of my PVM - its not quite there but its close.  I think DisplayHDR 1000 and above will be able to match.
-
-Currently defaults towards a Sammy Atomiswave.
-
-To use:
-Please Enable HDR in RetroArch 1.10+
-[UPDATE] This shader supports SDR as well - just enable it in the shader parameters
-
-NOTE: when this shader is envoked the Contrast, Peak Luminance and Paper White Luminance in the HDR menu do nothing instead set those values through the shader parameters 
-
-For this shader set Paper White Luminance to above 700 and Peak Luminance to the peak luminance of your monitor.   
-
-Also try to use a integer scaling - its just better - overscaling is fine/great.
-
-This shader doesn't do any geometry warping or bouncing of light around inside the screen - I think these effects just add unwanted noise, I know people disagree. Please feel free to make you own and add them
-
-Works only with the D3D11/D3D12/Vulkan drivers currently
-
-THIS SHADER DOES NOT SUPPORT WRGB OLED (Due to the sub pixel layout of WRGB - QD-OLED or LCD (and variants thereof screens are fine) - It will work just wont look right 
-*/
-
-shaders = "3"
-feedback_pass = "0"
-
-shader0 = "shaders/crt-sony-megatron-source-pass.slang"
-filter_linear0 = "false"
-scale_type0 = "source"
-scale0 = "1.0"
-wrap_mode0 = "clamp_to_border"
-mipmap_input0 = "false"
-alias0 = "SourceSDR"
-
-shader1 = "shaders/crt-sony-megatron-hdr-pass.slang"
-filter_linear1 = "false"
-scale_type1 = "source"
-scale1 = "1.0"
-wrap_mode1 = "clamp_to_border"
-mipmap_input1 = "false"
-alias1 = "SourceHDR"
-
-shader2 = "shaders/crt-sony-megatron.slang"
-filter_linear2 = "false"
-wrap_mode2 = "clamp_to_border"
-mipmap_input2 = "false"
-alias2 = ""
-float_framebuffer2 = "false"
-srgb_framebuffer2 = "false"
-
-hcrt_crt_screen_type = "2.000000"
-hcrt_paper_white_nits = "600.000000"
-hcrt_contrast = "0.000000"
-hcrt_expand_gamut = "1.000000"
-hcrt_red_scanline_min = "0.8900000"
-hcrt_red_scanline_max = "1.000000"
-hcrt_red_scanline_attack = "0.300000"
-hcrt_green_scanline_min = "0.600000"
-hcrt_green_scanline_max = "0.800000"
-hcrt_green_scanline_attack = "0.300000"
-hcrt_blue_scanline_min = "0.600000"
-hcrt_blue_scanline_max = "0.800000"
-hcrt_blue_scanline_attack = "0.300000"
-hcrt_red_beam_sharpness = "1.300000"
-hcrt_red_beam_attack = "1.000000"
-hcrt_green_beam_sharpness = "1.300000"
-hcrt_green_beam_attack = "1.000000"
-hcrt_blue_beam_sharpness = "1.300000"
-hcrt_blue_beam_attack = "1.000000"
diff --git a/hdr/crt-sony-megatron-bang-olufsen-mx8000.slangp b/hdr/crt-sony-megatron-bang-olufsen-mx8000.slangp
index 3d7302b..88ff802 100644
--- a/hdr/crt-sony-megatron-bang-olufsen-mx8000.slangp
+++ b/hdr/crt-sony-megatron-bang-olufsen-mx8000.slangp
@@ -1 +1,18 @@
-#reference "crt-sony-megatron-bang-olufsen.slangp"
+#reference "crt-sony-megatron.slangp"
+
+hcrt_crt_screen_type = "2.000000"
+hcrt_red_scanline_min = "0.650000"
+hcrt_red_scanline_max = "0.900000"
+hcrt_red_scanline_attack = "0.500000"
+hcrt_green_scanline_min = "0.650000"
+hcrt_green_scanline_max = "0.900000"
+hcrt_green_scanline_attack = "0.500000"
+hcrt_blue_scanline_min = "0.650000"
+hcrt_blue_scanline_max = "0.900000"
+hcrt_blue_scanline_attack = "0.500000"
+hcrt_red_beam_sharpness = "1.600000"
+hcrt_red_beam_attack = "1.7500000"
+hcrt_green_beam_sharpness = "1.600000"
+hcrt_green_beam_attack = "1.750000"
+hcrt_blue_beam_sharpness = "1.600000"
+hcrt_blue_beam_attack = "1.750000"
diff --git a/hdr/crt-sony-megatron-bang-olufsen.slangp b/hdr/crt-sony-megatron-bang-olufsen.slangp
deleted file mode 100644
index d5fd522..0000000
--- a/hdr/crt-sony-megatron-bang-olufsen.slangp
+++ /dev/null
@@ -1,73 +0,0 @@
-/*  
-Sony Megatron Colour Video Monitor
-Author: Major Pain The Cactus
-
-A shader that specifically tries to emulate Bang & Olufsen Beovision with a slot mask screen but with full brightness. 
-
-The novel thing about this shader is that it transforms the image output by the 'console/arcade/computer' into HDR space first i.e brightens it first and then applies 
-an slot mask afterwards which is kind of what a CRT would actually do - its kind of a kin to the electron beam (but nothing like it lol). 
-
-My DisplayHDR 600 monitor does seem to get reasonably close to the brightness of my PVM - its not quite there but its close.  I think DisplayHDR 1000 and above will be able to match.
-
-Currently defaults towards a Bang & Olufsen Beovision MX8000.
-
-To use:
-Please Enable HDR in RetroArch 1.10+
-[UPDATE] This shader supports SDR as well - just enable it in the shader parameters
-
-NOTE: when this shader is envoked the Contrast, Peak Luminance and Paper White Luminance in the HDR menu do nothing instead set those values through the shader parameters 
-
-For this shader set Paper White Luminance to above 700 and Peak Luminance to the peak luminance of your monitor.   
-
-Also try to use a integer scaling - its just better - overscaling is fine/great.
-
-This shader doesn't do any geometry warping or bouncing of light around inside the screen - I think these effects just add unwanted noise, I know people disagree. Please feel free to make you own and add them
-
-Works only with the D3D11/D3D12/Vulkan drivers currently
-
-THIS SHADER DOES NOT SUPPORT WRGB OLED (Due to the sub pixel layout of WRGB - QD-OLED or LCD (and variants thereof screens are fine) - It will work just wont look right
-*/
-
-shaders = "3"
-feedback_pass = "0"
-
-shader0 = "shaders/crt-sony-megatron-source-pass.slang"
-filter_linear0 = "false"
-scale_type0 = "source"
-scale0 = "1.0"
-wrap_mode0 = "clamp_to_border"
-mipmap_input0 = "false"
-alias0 = "SourceSDR"
-
-shader1 = "shaders/crt-sony-megatron-hdr-pass.slang"
-filter_linear1 = "false"
-scale_type1 = "source"
-scale1 = "1.0"
-wrap_mode1 = "clamp_to_border"
-mipmap_input1 = "false"
-alias1 = "SourceHDR"
-
-shader2 = "shaders/crt-sony-megatron.slang"
-filter_linear2 = "false"
-wrap_mode2 = "clamp_to_border"
-mipmap_input2 = "false"
-alias2 = ""
-float_framebuffer2 = "false"
-srgb_framebuffer2 = "false"
-
-hcrt_crt_screen_type = "2.000000"
-hcrt_red_scanline_min = "0.650000"
-hcrt_red_scanline_max = "0.900000"
-hcrt_red_scanline_attack = "0.500000"
-hcrt_green_scanline_min = "0.650000"
-hcrt_green_scanline_max = "0.900000"
-hcrt_green_scanline_attack = "0.500000"
-hcrt_blue_scanline_min = "0.650000"
-hcrt_blue_scanline_max = "0.900000"
-hcrt_blue_scanline_attack = "0.500000"
-hcrt_red_beam_sharpness = "1.600000"
-hcrt_red_beam_attack = "1.7500000"
-hcrt_green_beam_sharpness = "1.600000"
-hcrt_green_beam_attack = "1.750000"
-hcrt_blue_beam_sharpness = "1.600000"
-hcrt_blue_beam_attack = "1.750000"
diff --git a/hdr/crt-sony-megatron-jvc-d-series-AV-36D501.slangp b/hdr/crt-sony-megatron-jvc-d-series-AV-36D501.slangp
new file mode 100644
index 0000000..9d80d7c
--- /dev/null
+++ b/hdr/crt-sony-megatron-jvc-d-series-AV-36D501.slangp
@@ -0,0 +1,24 @@
+#reference "crt-sony-megatron.slangp"
+
+hcrt_crt_screen_type = "2.000000"
+hcrt_paper_white_nits = "700.000000"
+hcrt_brightness = "0.200000"
+hcrt_contrast = "0.000000"
+hcrt_saturation = "0.000000"
+hcrt_gamma = "-0.3000000"
+hcrt_expand_gamut = "1.000000"
+hcrt_red_scanline_min = "0.2000000"
+hcrt_red_scanline_max = "1.050000"
+hcrt_red_scanline_attack = "0.300000"
+hcrt_green_scanline_min = "0.200000"
+hcrt_green_scanline_max = "1.050000"
+hcrt_green_scanline_attack = "0.300000"
+hcrt_blue_scanline_min = "0.200000"
+hcrt_blue_scanline_max = "1.050000"
+hcrt_blue_scanline_attack = "0.300000"
+hcrt_red_beam_sharpness = "1.600000"
+hcrt_red_beam_attack = "1.000000"
+hcrt_green_beam_sharpness = "1.600000"
+hcrt_green_beam_attack = "1.000000"
+hcrt_blue_beam_sharpness = "1.600000"
+hcrt_blue_beam_attack = "1.000000"
\ No newline at end of file
diff --git a/hdr/crt-sony-megatron-jvc-professional-TM-H1950CG.slangp b/hdr/crt-sony-megatron-jvc-professional-TM-H1950CG.slangp
index f425ba5..b3fdafd 100644
--- a/hdr/crt-sony-megatron-jvc-professional-TM-H1950CG.slangp
+++ b/hdr/crt-sony-megatron-jvc-professional-TM-H1950CG.slangp
@@ -1 +1,24 @@
-#reference "crt-sony-megatron-jvc-professional.slangp"
\ No newline at end of file
+#reference "crt-sony-megatron.slangp"
+
+hcrt_paper_white_nits = "700.000000"
+hcrt_crt_screen_type = "1.000000"
+hcrt_crt_resolution = "2.000000"
+hcrt_expand_gamut = "1.000000"
+hcrt_red_vertical_convergence = "0.000000"
+hcrt_green_vertical_convergence = "0.040000"
+hcrt_blue_vertical_convergence = "0.000000"
+hcrt_red_scanline_min = "0.200000"
+hcrt_red_scanline_max = "0.750000"
+hcrt_red_scanline_attack = "1.000000"
+hcrt_green_scanline_min = "0.200000"
+hcrt_green_scanline_max = "0.750000"
+hcrt_green_scanline_attack = "1.000000"
+hcrt_blue_scanline_min = "0.200000"
+hcrt_blue_scanline_max = "0.750000"
+hcrt_blue_scanline_attack = "1.000000"
+hcrt_red_beam_sharpness = "1.000000"
+hcrt_red_beam_attack = "1.0000000"
+hcrt_green_beam_sharpness = "1.000000"
+hcrt_green_beam_attack = "1.000000"
+hcrt_blue_beam_sharpness = "1.000000"
+hcrt_blue_beam_attack = "1.000000"
\ No newline at end of file
diff --git a/hdr/crt-sony-megatron-jvc-professional.slangp b/hdr/crt-sony-megatron-jvc-professional.slangp
deleted file mode 100644
index b51beda..0000000
--- a/hdr/crt-sony-megatron-jvc-professional.slangp
+++ /dev/null
@@ -1,75 +0,0 @@
-/* 
-Sony Megatron Colour Video Monitor
-Author: Major Pain The Cactus
-
-A shader that specifically tries to emulate JVC professional monitor's with an shadow mask screen but with full brightness. 
-
-The novel thing about this shader is that it transforms the image output by the 'console/arcade/computer' into HDR space first i.e brightens it first and then applies 
-an shadow mask afterwards which is kind of what a CRT would actually do - its kind of a kin to the electron beam (but nothing like it lol). 
-
-My DisplayHDR 600 monitor does seem to get reasonably close to the brightness of my PVM - its not quite there but its close.  I think DisplayHDR 1000 and above will be able to match.
-
-Currently defaults towards a JVC Professional TM-H1950CG.
-
-To use:
-Please Enable HDR in RetroArch 1.10+
-[UPDATE] This shader supports SDR as well - just enable it in the shader parameters
-
-NOTE: when this shader is envoked the Contrast, Peak Luminance and Paper White Luminance in the HDR menu do nothing instead set those values through the shader parameters 
-
-For this shader set Paper White Luminance to above 700 and Peak Luminance to the peak luminance of your monitor.   
-
-Also try to use a integer scaling - its just better - overscaling is fine/great.
-
-This shader doesn't do any geometry warping or bouncing of light around inside the screen - I think these effects just add unwanted noise, I know people disagree. Please feel free to make you own and add them
-
-Works only with the D3D11/D3D12/Vulkan drivers currently
-
-THIS SHADER DOES NOT SUPPORT WRGB OLED (Due to the sub pixel layout of WRGB - QD-OLED or LCD (and variants thereof screens are fine) - It will work just wont look right 
-*/
-
-shaders = "3"
-feedback_pass = "0"
-
-shader0 = "shaders/crt-sony-megatron-source-pass.slang"
-filter_linear0 = "false"
-scale_type0 = "source"
-scale0 = "1.0"
-wrap_mode0 = "clamp_to_border"
-mipmap_input0 = "false"
-alias0 = "SourceSDR"
-
-shader1 = "shaders/crt-sony-megatron-hdr-pass.slang"
-filter_linear1 = "false"
-scale_type1 = "source"
-scale1 = "1.0"
-wrap_mode1 = "clamp_to_border"
-mipmap_input1 = "false"
-alias1 = "SourceHDR"
-
-shader2 = "shaders/crt-sony-megatron.slang"
-filter_linear2 = "false"
-wrap_mode2 = "clamp_to_border"
-mipmap_input2 = "false"
-alias2 = ""
-float_framebuffer2 = "false"
-srgb_framebuffer2 = "false"
-
-hcrt_crt_screen_type = "1.000000"
-hcrt_crt_resolution = "2.000000"
-hcrt_paper_white_nits = "400.000000"
-hcrt_red_scanline_min = "0.550000"
-hcrt_red_scanline_max = "0.800000"
-hcrt_red_scanline_attack = "1.000000"
-hcrt_green_scanline_min = "0.550000"
-hcrt_green_scanline_max = "0.800000"
-hcrt_green_scanline_attack = "1.000000"
-hcrt_blue_scanline_min = "0.550000"
-hcrt_blue_scanline_max = "0.800000"
-hcrt_blue_scanline_attack = "1.000000"
-hcrt_red_beam_sharpness = "2.000000"
-hcrt_red_beam_attack = "0.7500000"
-hcrt_green_beam_sharpness = "2.000000"
-hcrt_green_beam_attack = "0.750000"
-hcrt_blue_beam_sharpness = "2.000000"
-hcrt_blue_beam_attack = "0.750000"
\ No newline at end of file
diff --git a/hdr/crt-sony-megatron-sammy-atomiswave.slangp b/hdr/crt-sony-megatron-sammy-atomiswave.slangp
index 79530b0..d7c55eb 100644
--- a/hdr/crt-sony-megatron-sammy-atomiswave.slangp
+++ b/hdr/crt-sony-megatron-sammy-atomiswave.slangp
@@ -1 +1,21 @@
-#reference "crt-sony-megatron-arcade.slangp"
\ No newline at end of file
+#reference "crt-sony-megatron.slangp"
+
+hcrt_crt_screen_type = "2.000000"
+hcrt_paper_white_nits = "600.000000"
+hcrt_contrast = "0.000000"
+hcrt_expand_gamut = "1.000000"
+hcrt_red_scanline_min = "0.8900000"
+hcrt_red_scanline_max = "1.000000"
+hcrt_red_scanline_attack = "0.300000"
+hcrt_green_scanline_min = "0.600000"
+hcrt_green_scanline_max = "0.800000"
+hcrt_green_scanline_attack = "0.300000"
+hcrt_blue_scanline_min = "0.600000"
+hcrt_blue_scanline_max = "0.800000"
+hcrt_blue_scanline_attack = "0.300000"
+hcrt_red_beam_sharpness = "1.300000"
+hcrt_red_beam_attack = "1.000000"
+hcrt_green_beam_sharpness = "1.300000"
+hcrt_green_beam_attack = "1.000000"
+hcrt_blue_beam_sharpness = "1.300000"
+hcrt_blue_beam_attack = "1.000000"
\ No newline at end of file
diff --git a/hdr/crt-sony-megatron-sega-virtua-fighter.slangp b/hdr/crt-sony-megatron-sega-virtua-fighter.slangp
index 7c6e830..fd518f9 100644
--- a/hdr/crt-sony-megatron-sega-virtua-fighter.slangp
+++ b/hdr/crt-sony-megatron-sega-virtua-fighter.slangp
@@ -1,5 +1,6 @@
-#reference "crt-sony-megatron-arcade.slangp"
+#reference "crt-sony-megatron.slangp"
 
+hcrt_crt_screen_type = "2.000000"
 hcrt_paper_white_nits = "200.000000"
 hcrt_expand_gamut = "1.000000"
 hcrt_red_vertical_convergence = "0.200000"
diff --git a/hdr/crt-sony-megatron-sony-pvm-1910.slangp b/hdr/crt-sony-megatron-sony-pvm-1910.slangp
index dd4a97e..10c6d05 100644
--- a/hdr/crt-sony-megatron-sony-pvm-1910.slangp
+++ b/hdr/crt-sony-megatron-sony-pvm-1910.slangp
@@ -1,4 +1,4 @@
-#reference "crt-sony-megatron-sony-pvm.slangp"
+#reference "crt-sony-megatron.slangp"
 
 hcrt_crt_resolution = "0.000000"
 hcrt_colour_system = "0.000000"
diff --git a/hdr/crt-sony-megatron-sony-pvm-20L4.slangp b/hdr/crt-sony-megatron-sony-pvm-20L4.slangp
index cd55680..6bceb74 100644
--- a/hdr/crt-sony-megatron-sony-pvm-20L4.slangp
+++ b/hdr/crt-sony-megatron-sony-pvm-20L4.slangp
@@ -1,5 +1,11 @@
-#reference "crt-sony-megatron-sony-pvm.slangp"
+#reference "crt-sony-megatron.slangp"
 
+hcrt_brightness = "0.150000"
+hcrt_colour_system = "0.000000"
+hcrt_white_temperature = "2800.000000"
+hcrt_expand_gamut = "1.000000"
+hcrt_contrast = "0.000000"
+hcrt_gamma = "0.000000"
 hcrt_crt_resolution = "1.000000"
 hcrt_red_vertical_convergence = "0.100000"
 hcrt_green_vertical_convergence = "0.000000"
diff --git a/hdr/crt-sony-megatron-sony-pvm-2730.slangp b/hdr/crt-sony-megatron-sony-pvm-2730.slangp
index bfae743..02d7070 100644
--- a/hdr/crt-sony-megatron-sony-pvm-2730.slangp
+++ b/hdr/crt-sony-megatron-sony-pvm-2730.slangp
@@ -1 +1,26 @@
-#reference "crt-sony-megatron-sony-pvm.slangp"
+#reference "crt-sony-megatron.slangp"
+
+hcrt_brightness = "0.150000"
+hcrt_colour_system = "0.000000"
+hcrt_white_temperature = "2800.000000"
+hcrt_expand_gamut = "1.000000"
+hcrt_contrast = "0.000000"
+hcrt_gamma = "0.000000"
+hcrt_red_vertical_convergence = "-0.140000"
+hcrt_green_vertical_convergence = "0.000000"
+hcrt_blue_vertical_convergence = "0.000000"
+hcrt_red_scanline_min = "0.550000"
+hcrt_red_scanline_max = "0.820000"
+hcrt_red_scanline_attack = "0.650000"
+hcrt_green_scanline_min = "0.550000"
+hcrt_green_scanline_max = "0.900000"
+hcrt_green_scanline_attack = "0.130000"
+hcrt_blue_scanline_min = "0.720000"
+hcrt_blue_scanline_max = "1.000000"
+hcrt_blue_scanline_attack = "0.650000"
+hcrt_red_beam_sharpness = "1.750000"
+hcrt_red_beam_attack = "0.7200000"
+hcrt_green_beam_sharpness = "1.600000"
+hcrt_green_beam_attack = "0.800000"
+hcrt_blue_beam_sharpness = "1.900000"
+hcrt_blue_beam_attack = "0.450000"
diff --git a/hdr/crt-sony-megatron-sony-pvm.slangp b/hdr/crt-sony-megatron-sony-pvm.slangp
deleted file mode 100644
index 6a5caec..0000000
--- a/hdr/crt-sony-megatron-sony-pvm.slangp
+++ /dev/null
@@ -1,82 +0,0 @@
-/* 
-Sony Megatron Colour Video Monitor
-Author: Major Pain The Cactus
-
-A shader that specifically tries to emulate Sony PVM's with an aperture grille screen but with full brightness. 
-
-The novel thing about this shader is that it transforms the image output by the 'console/arcade/computer' into HDR space first i.e brightens it first and then applies 
-an aperture grille afterwards which is kind of what a CRT would actually do - its kind of a kin to the electron beam (but nothing like it lol). 
-
-My DisplayHDR 600 monitor does seem to get reasonably close to the brightness of my PVM - its not quite there but its close.  I think DisplayHDR 1000 and above will be able to match.
-
-Currently defaults towards a Sony PVM 2730QM a reasonably old mid 1980's 27" 600TVL pro monitor.
-
-To use:
-Please Enable HDR in RetroArch 1.10+
-[UPDATE] This shader supports SDR as well - just enable it in the shader parameters
-
-NOTE: when this shader is envoked the Contrast, Peak Luminance and Paper White Luminance in the HDR menu do nothing instead set those values through the shader parameters 
-
-For this shader set Paper White Luminance to above 700 and Peak Luminance to the peak luminance of your monitor.  
-
-Also try to use a integer scaling - its just better - overscaling is fine/great.
-
-This shader doesn't do any geometry warping or bouncing of light around inside the screen - I think these effects just add unwanted noise, I know people disagree. Please feel free to make you own and add them
-
-Works only with the D3D11/D3D12/Vulkan drivers currently
-
-THIS SHADER DOES NOT SUPPORT WRGB OLED (Due to the sub pixel layout of WRGB - QD-OLED or LCD (and variants thereof screens are fine) - It will work just wont look right
-*/
-
-shaders = "3"
-feedback_pass = "0"
-
-shader0 = "shaders/crt-sony-megatron-source-pass.slang"
-filter_linear0 = "false"
-scale_type0 = "source"
-scale0 = "1.0"
-wrap_mode0 = "clamp_to_border"
-mipmap_input0 = "false"
-alias0 = "SourceSDR"
-
-shader1 = "shaders/crt-sony-megatron-hdr-pass.slang"
-filter_linear1 = "false"
-scale_type1 = "source"
-scale1 = "1.0"
-wrap_mode1 = "clamp_to_border"
-mipmap_input1 = "false"
-alias1 = "SourceHDR"
-
-shader2 = "shaders/crt-sony-megatron.slang"
-filter_linear2 = "false"
-wrap_mode2 = "clamp_to_border"
-mipmap_input2 = "false"
-alias2 = ""
-float_framebuffer2 = "false"
-srgb_framebuffer2 = "false"
-
-hcrt_brightness = "0.150000"
-hcrt_colour_system = "0.000000"
-hcrt_white_temperature = "2800.000000"
-hcrt_expand_gamut = "1.000000"
-hcrt_contrast = "0.000000"
-hcrt_gamma = "0.000000"
-hcrt_red_vertical_convergence = "-0.140000"
-hcrt_green_vertical_convergence = "0.000000"
-hcrt_blue_vertical_convergence = "0.000000"
-hcrt_red_scanline_min = "0.550000"
-hcrt_red_scanline_max = "0.820000"
-hcrt_red_scanline_attack = "0.650000"
-hcrt_green_scanline_min = "0.550000"
-hcrt_green_scanline_max = "0.900000"
-hcrt_green_scanline_attack = "0.130000"
-hcrt_blue_scanline_min = "0.720000"
-hcrt_blue_scanline_max = "1.000000"
-hcrt_blue_scanline_attack = "0.650000"
-hcrt_red_beam_sharpness = "1.750000"
-hcrt_red_beam_attack = "0.7200000"
-hcrt_green_beam_sharpness = "1.600000"
-hcrt_green_beam_attack = "0.800000"
-hcrt_blue_beam_sharpness = "1.900000"
-hcrt_blue_beam_attack = "0.450000"
-
diff --git a/hdr/crt-sony-megatron-toshiba-microfilter.slangp b/hdr/crt-sony-megatron-toshiba-microfilter.slangp
index a25ebd1..e1ca15e 100644
--- a/hdr/crt-sony-megatron-toshiba-microfilter.slangp
+++ b/hdr/crt-sony-megatron-toshiba-microfilter.slangp
@@ -1,58 +1,3 @@
-/* 
-Sony Megatron Colour Video Monitor
-Author: Major Pain The Cactus
-
-A shader that specifically tries to emulate Toshiba MicroFilter monitor's with an shadow mask screen but with full brightness. 
-
-The novel thing about this shader is that it transforms the image output by the 'console/arcade/computer' into HDR space first i.e brightens it first and then applies 
-an shadow mask afterwards which is kind of what a CRT would actually do - its kind of a kin to the electron beam (but nothing like it lol). 
-
-My DisplayHDR 600 monitor does seem to get reasonably close to the brightness of my PVM - its not quite there but its close.  I think DisplayHDR 1000 and above will be able to match.
-
-Currently defaults towards a XXXX CRT MAKE MODEL XXXX.
-
-To use:
-Please Enable HDR in RetroArch 1.10+
-[UPDATE] This shader supports SDR as well - just enable it in the shader parameters
-
-NOTE: when this shader is envoked the Contrast, Peak Luminance and Paper White Luminance in the HDR menu do nothing instead set those values through the shader parameters 
-
-For this shader set Paper White Luminance to above 700 and Peak Luminance to the peak luminance of your monitor.   
-
-Also try to use a integer scaling - its just better - overscaling is fine/great.
-
-This shader doesn't do any geometry warping or bouncing of light around inside the screen - I think these effects just add unwanted noise, I know people disagree. Please feel free to make you own and add them
-
-Works only with the D3D11/D3D12/Vulkan drivers currently
-
-THIS SHADER DOES NOT SUPPORT WRGB OLED (Due to the sub pixel layout of WRGB - QD-OLED or LCD (and variants thereof screens are fine) - It will work just wont look right 
-*/
-
-shaders = "3"
-feedback_pass = "0"
-
-shader0 = "shaders/crt-sony-megatron-source-pass.slang"
-filter_linear0 = "false"
-scale_type0 = "source"
-scale0 = "1.0"
-wrap_mode0 = "clamp_to_border"
-mipmap_input0 = "false"
-alias0 = "SourceSDR"
-
-shader1 = "shaders/crt-sony-megatron-hdr-pass.slang"
-filter_linear1 = "false"
-scale_type1 = "source"
-scale1 = "1.0"
-wrap_mode1 = "clamp_to_border"
-mipmap_input1 = "false"
-alias1 = "SourceHDR"
-
-shader2 = "shaders/crt-sony-megatron.slang"
-filter_linear2 = "false"
-wrap_mode2 = "clamp_to_border"
-mipmap_input2 = "false"
-alias2 = ""
-float_framebuffer2 = "false"
-srgb_framebuffer2 = "false"
+#reference "crt-sony-megatron.slangp"
 
 hcrt_crt_screen_type = "1.000000"
diff --git a/hdr/crt-sony-megatron-viewsonic-A90f+.slangp b/hdr/crt-sony-megatron-viewsonic-A90f+.slangp
index fe5e76b..87c632b 100644
--- a/hdr/crt-sony-megatron-viewsonic-A90f+.slangp
+++ b/hdr/crt-sony-megatron-viewsonic-A90f+.slangp
@@ -1 +1,20 @@
-#reference "crt-sony-megatron-viewsonic-superclear.slangp"
\ No newline at end of file
+#reference "crt-sony-megatron.slangp"
+
+hcrt_crt_screen_type = "1.000000"
+hcrt_crt_resolution = "2.000000"
+hcrt_paper_white_nits = "400.000000"
+hcrt_red_scanline_min = "0.5000000"
+hcrt_red_scanline_max = "1.000000"
+hcrt_red_scanline_attack = "0.350000"
+hcrt_green_scanline_min = "0.550000"
+hcrt_green_scanline_max = "1.000000"
+hcrt_green_scanline_attack = "0.350000"
+hcrt_blue_scanline_min = "0.550000"
+hcrt_blue_scanline_max = "1.000000"
+hcrt_blue_scanline_attack = "0.350000"
+hcrt_red_beam_sharpness = "1.200000"
+hcrt_red_beam_attack = "0.5000000"
+hcrt_green_beam_sharpness = "1.200000"
+hcrt_green_beam_attack = "0.500000"
+hcrt_blue_beam_sharpness = "1.200000"
+hcrt_blue_beam_attack = "0.500000"
\ No newline at end of file
diff --git a/hdr/crt-sony-megatron-viewsonic-superclear.slangp b/hdr/crt-sony-megatron-viewsonic-superclear.slangp
deleted file mode 100644
index 53bb08a..0000000
--- a/hdr/crt-sony-megatron-viewsonic-superclear.slangp
+++ /dev/null
@@ -1,75 +0,0 @@
-/* 
-Sony Megatron Colour Video Monitor
-Author: Major Pain The Cactus
-
-A shader that specifically tries to emulate Viewsonic SuperClear monitor's with an shadow mask screen but with full brightness. 
-
-The novel thing about this shader is that it transforms the image output by the 'console/arcade/computer' into HDR space first i.e brightens it first and then applies 
-an shadow mask afterwards which is kind of what a CRT would actually do - its kind of a kin to the electron beam (but nothing like it lol). 
-
-My DisplayHDR 600 monitor does seem to get reasonably close to the brightness of my PVM - its not quite there but its close.  I think DisplayHDR 1000 and above will be able to match.
-
-Currently defaults towards a Viewsonic A90f+.
-
-To use:
-Please Enable HDR in RetroArch 1.10+
-[UPDATE] This shader supports SDR as well - just enable it in the shader parameters
-
-NOTE: when this shader is envoked the Contrast, Peak Luminance and Paper White Luminance in the HDR menu do nothing instead set those values through the shader parameters 
-
-For this shader set Paper White Luminance to above 700 and Peak Luminance to the peak luminance of your monitor.   
-
-Also try to use a integer scaling - its just better - overscaling is fine/great.
-
-This shader doesn't do any geometry warping or bouncing of light around inside the screen - I think these effects just add unwanted noise, I know people disagree. Please feel free to make you own and add them
-
-Works only with the D3D11/D3D12/Vulkan drivers currently
-
-THIS SHADER DOES NOT SUPPORT WRGB OLED (Due to the sub pixel layout of WRGB - QD-OLED or LCD (and variants thereof screens are fine) - It will work just wont look right 
-*/
-
-shaders = "3"
-feedback_pass = "0"
-
-shader0 = "shaders/crt-sony-megatron-source-pass.slang"
-filter_linear0 = "false"
-scale_type0 = "source"
-scale0 = "1.0"
-wrap_mode0 = "clamp_to_border"
-mipmap_input0 = "false"
-alias0 = "SourceSDR"
-
-shader1 = "shaders/crt-sony-megatron-hdr-pass.slang"
-filter_linear1 = "false"
-scale_type1 = "source"
-scale1 = "1.0"
-wrap_mode1 = "clamp_to_border"
-mipmap_input1 = "false"
-alias1 = "SourceHDR"
-
-shader2 = "shaders/crt-sony-megatron.slang"
-filter_linear2 = "false"
-wrap_mode2 = "clamp_to_border"
-mipmap_input2 = "false"
-alias2 = ""
-float_framebuffer2 = "false"
-srgb_framebuffer2 = "false"
-
-hcrt_crt_screen_type = "1.000000"
-hcrt_crt_resolution = "2.000000"
-hcrt_paper_white_nits = "400.000000"
-hcrt_red_scanline_min = "0.5000000"
-hcrt_red_scanline_max = "1.000000"
-hcrt_red_scanline_attack = "0.350000"
-hcrt_green_scanline_min = "0.550000"
-hcrt_green_scanline_max = "1.000000"
-hcrt_green_scanline_attack = "0.350000"
-hcrt_blue_scanline_min = "0.550000"
-hcrt_blue_scanline_max = "1.000000"
-hcrt_blue_scanline_attack = "0.350000"
-hcrt_red_beam_sharpness = "1.200000"
-hcrt_red_beam_attack = "0.5000000"
-hcrt_green_beam_sharpness = "1.200000"
-hcrt_green_beam_attack = "0.500000"
-hcrt_blue_beam_sharpness = "1.200000"
-hcrt_blue_beam_attack = "0.500000"