diff --git a/hdr/crt-sony-megatron-jvc-d-series-AV-36D501-hdr.slangp b/hdr/crt-sony-megatron-jvc-d-series-AV-36D501-hdr.slangp
index ade5c4b..7dfd0d1 100644
--- a/hdr/crt-sony-megatron-jvc-d-series-AV-36D501-hdr.slangp
+++ b/hdr/crt-sony-megatron-jvc-d-series-AV-36D501-hdr.slangp
@@ -5,7 +5,6 @@ hcrt_paper_white_nits = "700.000000"
 hcrt_brightness = "0.200000"
 hcrt_contrast = "0.000000"
 hcrt_saturation = "0.000000"
-hcrt_gamma_in = "1.920000"
 hcrt_expand_gamut = "1.000000"
 hcrt_red_scanline_min = "0.2000000"
 hcrt_red_scanline_max = "1.050000"
diff --git a/hdr/crt-sony-megatron-jvc-d-series-AV-36D501-sdr.slangp b/hdr/crt-sony-megatron-jvc-d-series-AV-36D501-sdr.slangp
index f312fd1..3d99308 100644
--- a/hdr/crt-sony-megatron-jvc-d-series-AV-36D501-sdr.slangp
+++ b/hdr/crt-sony-megatron-jvc-d-series-AV-36D501-sdr.slangp
@@ -5,8 +5,6 @@ hcrt_paper_white_nits = "700.000000"
 hcrt_brightness = "0.200000"
 hcrt_contrast = "0.000000"
 hcrt_saturation = "0.000000"
-hcrt_gamma_in = "1.720000"
-hcrt_expand_gamut = "1.000000"
 hcrt_red_scanline_min = "0.2000000"
 hcrt_red_scanline_max = "1.050000"
 hcrt_red_scanline_attack = "0.300000"
diff --git a/hdr/crt-sony-megatron-jvc-professional-TM-H1950CG-sdr.slangp b/hdr/crt-sony-megatron-jvc-professional-TM-H1950CG-sdr.slangp
index 1f6c95b..958f1fa 100644
--- a/hdr/crt-sony-megatron-jvc-professional-TM-H1950CG-sdr.slangp
+++ b/hdr/crt-sony-megatron-jvc-professional-TM-H1950CG-sdr.slangp
@@ -3,7 +3,6 @@
 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"
diff --git a/hdr/crt-sony-megatron-sammy-atomiswave-sdr.slangp b/hdr/crt-sony-megatron-sammy-atomiswave-sdr.slangp
index e62d990..8c6aa70 100644
--- a/hdr/crt-sony-megatron-sammy-atomiswave-sdr.slangp
+++ b/hdr/crt-sony-megatron-sammy-atomiswave-sdr.slangp
@@ -3,7 +3,6 @@
 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"
diff --git a/hdr/crt-sony-megatron-sega-virtua-fighter-sdr.slangp b/hdr/crt-sony-megatron-sega-virtua-fighter-sdr.slangp
index 2185b45..c29f31b 100644
--- a/hdr/crt-sony-megatron-sega-virtua-fighter-sdr.slangp
+++ b/hdr/crt-sony-megatron-sega-virtua-fighter-sdr.slangp
@@ -2,7 +2,6 @@
 
 hcrt_crt_screen_type = "2.000000"
 hcrt_paper_white_nits = "200.000000"
-hcrt_expand_gamut = "1.000000"
 hcrt_red_vertical_convergence = "0.200000"
 hcrt_green_vertical_convergence = "0.200000"
 hcrt_blue_vertical_convergence = "-0.230000"
diff --git a/hdr/crt-sony-megatron-sony-pvm-1910-hdr.slangp b/hdr/crt-sony-megatron-sony-pvm-1910-hdr.slangp
index 356cf4c..e929586 100644
--- a/hdr/crt-sony-megatron-sony-pvm-1910-hdr.slangp
+++ b/hdr/crt-sony-megatron-sony-pvm-1910-hdr.slangp
@@ -5,7 +5,6 @@ hcrt_colour_system = "3.000000"
 hcrt_expand_gamut = "1.000000"
 hcrt_brightness = "0.150000"
 hcrt_saturation = "0.100000"
-hcrt_gamma_in = "2.470000"
 hcrt_red_vertical_convergence = "0.000000"
 hcrt_green_vertical_convergence = "-0.150000"
 hcrt_blue_vertical_convergence = "0.000000"
diff --git a/hdr/crt-sony-megatron-sony-pvm-1910-sdr.slangp b/hdr/crt-sony-megatron-sony-pvm-1910-sdr.slangp
index 84cdbe1..9697126 100644
--- a/hdr/crt-sony-megatron-sony-pvm-1910-sdr.slangp
+++ b/hdr/crt-sony-megatron-sony-pvm-1910-sdr.slangp
@@ -2,10 +2,8 @@
 
 hcrt_crt_resolution = "0.000000"
 hcrt_colour_system = "3.000000"
-hcrt_expand_gamut = "1.000000"
 hcrt_brightness = "0.150000"
 hcrt_saturation = "0.100000"
-hcrt_gamma_in = "2.270000"
 hcrt_red_vertical_convergence = "0.000000"
 hcrt_green_vertical_convergence = "-0.150000"
 hcrt_blue_vertical_convergence = "0.000000"
diff --git a/hdr/crt-sony-megatron-sony-pvm-20L4-sdr.slangp b/hdr/crt-sony-megatron-sony-pvm-20L4-sdr.slangp
index 9ef527d..ae5a926 100644
--- a/hdr/crt-sony-megatron-sony-pvm-20L4-sdr.slangp
+++ b/hdr/crt-sony-megatron-sony-pvm-20L4-sdr.slangp
@@ -2,7 +2,6 @@
 
 hcrt_brightness = "0.150000"
 hcrt_colour_system = "3.000000"
-hcrt_expand_gamut = "1.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-sdr.slangp b/hdr/crt-sony-megatron-sony-pvm-2730-sdr.slangp
index e1d73fc..35c2dd7 100644
--- a/hdr/crt-sony-megatron-sony-pvm-2730-sdr.slangp
+++ b/hdr/crt-sony-megatron-sony-pvm-2730-sdr.slangp
@@ -2,7 +2,6 @@
 
 hcrt_brightness = "0.150000"
 hcrt_colour_system = "3.000000"
-hcrt_expand_gamut = "1.000000"
 hcrt_red_vertical_convergence = "-0.140000"
 hcrt_green_vertical_convergence = "0.000000"
 hcrt_blue_vertical_convergence = "0.000000"
diff --git a/hdr/crt-sony-megatron-toshiba-microfilter-sdr.slangp b/hdr/crt-sony-megatron-toshiba-microfilter-sdr.slangp
index 3d3a8f5..4d01149 100644
--- a/hdr/crt-sony-megatron-toshiba-microfilter-sdr.slangp
+++ b/hdr/crt-sony-megatron-toshiba-microfilter-sdr.slangp
@@ -1,3 +1,3 @@
 #reference "shaders/crt-sony-megatron-sdr.slangp"
 
-hcrt_crt_screen_type = "1.000000"
\ No newline at end of file
+hcrt_crt_screen_type = "1.000000"
diff --git a/hdr/shaders/crt-sony-megatron-hdr-pass.slang b/hdr/shaders/crt-sony-megatron-hdr-pass.slang
index f9c8de5..0d5af68 100644
--- a/hdr/shaders/crt-sony-megatron-hdr-pass.slang
+++ b/hdr/shaders/crt-sony-megatron-hdr-pass.slang
@@ -23,7 +23,7 @@ Dont use this shader directly - use the hdr\crt-make-model-hdr.slangp where make
 THIS SHADER DOES NOT SUPPORT WRGB OLED (Due to the sub pixel layout of WRGB - RGB QD-OLED or LCD (and variants thereof screens are fine)
 */
 
-#pragma format A2B10G10R10_UNORM_PACK32
+#pragma format R16G16B16A16_SFLOAT
 
 layout(push_constant) uniform Push
 {
diff --git a/hdr/shaders/crt-sony-megatron-sdr.slangp b/hdr/shaders/crt-sony-megatron-sdr.slangp
index aa63f20..c0fa22c 100644
--- a/hdr/shaders/crt-sony-megatron-sdr.slangp
+++ b/hdr/shaders/crt-sony-megatron-sdr.slangp
@@ -2,4 +2,4 @@
 
 hcrt_hdr = "0.000000"
 
-hcrt_gamma_in = "2.020000"
+hcrt_gamma_in = "2.000000"
diff --git a/hdr/shaders/crt-sony-megatron-source-pass.slang b/hdr/shaders/crt-sony-megatron-source-pass.slang
index 1fcd2b8..8ccb124 100644
--- a/hdr/shaders/crt-sony-megatron-source-pass.slang
+++ b/hdr/shaders/crt-sony-megatron-source-pass.slang
@@ -23,6 +23,8 @@ Dont use this shader directly - use the hdr\crt-make-model-hdr.slangp where make
 THIS SHADER DOES NOT SUPPORT WRGB OLED (Due to the sub pixel layout of WRGB - RGB QD-OLED or LCD (and variants thereof screens are fine)
 */
 
+#pragma format R16G16B16A16_SFLOAT
+
 layout(push_constant) uniform Push
 {
    float hcrt_hdr;
diff --git a/hdr/shaders/crt-sony-megatron.slangp b/hdr/shaders/crt-sony-megatron.slangp
index 3da5814..d0bd75e 100644
--- a/hdr/shaders/crt-sony-megatron.slangp
+++ b/hdr/shaders/crt-sony-megatron.slangp
@@ -36,6 +36,7 @@ scale0 = "1.0"
 wrap_mode0 = "clamp_to_border"
 mipmap_input0 = "false"
 alias0 = "SourceSDR"
+float_framebuffer0 = "true"
 
 shader1 = "crt-sony-megatron-hdr-pass.slang"
 filter_linear1 = "false"
@@ -44,6 +45,7 @@ scale1 = "1.0"
 wrap_mode1 = "clamp_to_border"
 mipmap_input1 = "false"
 alias1 = "SourceHDR"
+float_framebuffer1 = "true"
 
 shader2 = "crt-sony-megatron.slang"
 filter_linear2 = "false"
diff --git a/hdr/shaders/include/parameters.h b/hdr/shaders/include/parameters.h
index 6415ca2..9037767 100644
--- a/hdr/shaders/include/parameters.h
+++ b/hdr/shaders/include/parameters.h
@@ -29,8 +29,8 @@
 #pragma parameter hcrt_brightness                    "    Brightness"                                               0.0     -1.0   1.0      0.01
 #pragma parameter hcrt_contrast                      "    Contrast"                                                 0.0     -1.0   1.0      0.01
 #pragma parameter hcrt_saturation                    "    Saturation"                                               0.0     -1.0   1.0      0.01
-#pragma parameter hcrt_gamma_in                      "    Gamma In"                                                 2.22     1.22  3.22     0.01
-#pragma parameter hcrt_gamma_out                     "    Gamma Out"                                                2.4      2.0   2.8      0.005
+#pragma parameter hcrt_gamma_in                      "    Gamma In"                                                 2.4      1.0   5.0      0.01
+#pragma parameter hcrt_gamma_out                     "    Gamma Out"                                                2.4      1.0   5.0      0.01
 #pragma parameter hcrt_pin_phase                     "    Pin Phase"                                                0.00    -0.2   0.2      0.01
 #pragma parameter hcrt_pin_amp                       "    Pin Amp"                                                  0.00    -0.2   0.2      0.01
 #pragma parameter hcrt_space3                        " "                                                            0.0      0.0   0.0001   0.0001